Fix batching