Refactor Polygon Checking to Stop Occasional Failure