closes #1785