Fix compilation error introduced by merging in earlier pull request