Properly fix #589 this time

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