Closes Issue #1610