last commit closes #2498