fix the crap