fix up hf a bit