fixing shit!