Bug fix: calculate overlapping correctly
Merge pull request #625 from cfscosta/3.14.x

Bug fix: calculate overlapping correctly