Gauge-cluster-repair