small changes
adjust for new behaviour of Polygon