closes #1975