fix shape methods with batching