Closes Issue #1456