closes #1824