! Fix a bug and make things slightly more consistent (fixes #1412)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>