closes #1724