Fix: batches