closes #1840