Fix a bug with with commit 2621dd42 that happened due to my last second pre-commit cleanup of the change without proper testing afterwards!