fixing dis crap