Correction following comments on the pull request