closes #1902