Batch fix2