Shitload of more fix