closes #1757