Added some reunits to the gauge fixing to make it moderately safer