Fix wrong delay calculation
Merge branch 'hotfix-delay-calculation'