closes #2531