Update for pull request #837