closes #1728