closes #1988