Finally fix HFM

Change-Id: I7e8c901ee7589df3c7820346ac19f120a625b3e5