Batch fix