Tagged mechanical-repair