closes #1920