Tentative fix of windows build
Merge pull request #2939 from davidegrohmann/2.2-fix-windows-build

Tentative fix of windows build