Repair when things are manageable