Fixing issue on win32