[master] Fixing to Windows SO