! Previous fix for #1221 was horribly incomplete (fixes #1475 and #1484)

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