closes #1692