Fixed for multi-polygons