Fix issue with intersections only being added to the topmost way