improved halo fit for weird cases