closes #1932