closes #1964