FLAG REPAIR