closes #1837