closes #2261