fixed mapping of hh