Rigid Repair