Fixed: further fix for empty batches.