closes #1734