removing ugly hack