Gauge-Cluster-Repair