Properly fix #589 this time

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #592 from Oldiesmann/release-2.1

Properly fix #589 this time