closes #1942