CRAP!! fixed