fixed nhif issues