Final fix for Windows version