closes #2086