correctly handle intersections for #1159