closes #1731