Get rid of these awful hacks!!