ahmadsamir: feel free to push a windows fix made from documentation, and check if CI builds. And fix it if not :) Won't be the first time we "hack blind" for Windows. When it's about compilation errors it's easy enough to use the CI to find out what's right.