Another attempt at fixing Halo