Tagged repair