Fix this crap