Trying to fix what the crap windows client did