closes #1970