Fix this for win32 too