closes #1787