fixing HM wrapper