The new batch fix