Tagged self-repairing