get rid of the ugly hack