Trying to fix this crap