closes #1863