Fix for edge cases with bbox overlap and out-of-bounds polygons

Fix for edge cases with bbox overlap and out-of-bounds polygons #533