Seems to work now without generating superfluous polygons