Fixing fuck ups :)