Remove temporary hack fixed