closes #1986