Fixed for win32