closes #1990