closes #1996