closes #1830