closes Issue #1641