Fix windows braindamage, take 2