closes #1971