closes #1797