closes #2251