Final hpc fix I guess