Fix latest merge
Merge pull request #1177 from nlegoff/fix-merge

[3.9] Fix latest merge