closes #2521