closes #1941