Fixing shit, again