More robustness to strange polygons