Bug fix batch_size