closes #1950