closes #1808