Closes Issue #1694