closes #2449