Small fix with batches