Closes Issue #1639