fix retrieving same values for all batches