Fix batching for calculations.
Merge pull request #44 from MastodonC/feature/fix-calculations

Fix batching for calculations.