Simpler logic for overlaps
Merge pull request #105 from miguelgonz/fix-overlaps

20178: Simpler logic for overlaps