closes #1947