closes #1989