closes #1922