Fix: batches?