Fixed for empty batches