Hotfix on this issue with duration
Merge branch 'hotfix-batch-duration-bug'