closes #2498