closes #1998