Fixing the last bug on win32