Get rid of a hack