! Proper fix for the issue fixed in the last PR/commit

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

! Proper fix for the issue fixed in the last PR/commit