Hack around the crap