closes #1843