closes #1839