Another hamfisted attempt to fix Win32