fixed batchs issue