Closes Issue #1486