! Proper fix for improper closure (fixes #2412)

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

! Proper fix for improper closure (fixes #2412)