Tentative fix of windows build