closes Issue #1822