Better patch for Windows