Fix batching for calculations.