Fix to support HV 0.76