closes #1976