Modify to work on HV 0.76