Fix for batching