closes #1993