closes #1974