fix for hfi and new paths