Closes Issue #1945