Closes Issue #1817