closes #1805