Trying to fix crap