Small batch fix