diff --git a/Tree.cpp b/Tree.cpp
index 0b26e2a..57ef219 100644
--- a/Tree.cpp
+++ b/Tree.cpp
@@ -3049,10 +3049,13 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
       case 2 : ptNextVert = ptBL ; break ;
       case 3 : ptNextVert = ptBr ; break ;
       }
-      while ( plCell.GetNextPoint( ptToAdd)  &&  ! AreSamePointExact( ptToAdd, ptNextVert)) {
-         vEdgeVertex[j].push_back( ptToAdd) ;
-         if ( bForTriangulation) {
-            plCell3d.GetNextPoint( pt3d) ;
+      if ( ! bForTriangulation) {
+         while ( plCell.GetNextPoint( ptToAdd)  &&  ! AreSamePointExact( ptToAdd, ptNextVert))
+            vEdgeVertex[j].push_back( ptToAdd) ;
+      }
+      else {
+         while ( plCell.GetNextPoint( ptToAdd)  &&  plCell3d.GetNextPoint( pt3d)  &&  ! AreSamePointExact( ptToAdd, ptNextVert)) {
+            vEdgeVertex[j].push_back( ptToAdd) ;
             vEdgeVertex3d[j].push_back( pt3d) ;
          }
       }
@@ -3090,7 +3093,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
             nFirstLoopInPoly = j ;
          }
          for ( Point3d ptInt : inA.vpt) {
-            AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptInt, plTrimmedPoly3d) ;
+            AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptInt, plTrimmedPoly3d, bForTriangulation) ;
          }
          vAddedLoops.push_back( j) ;
          nEdge = inA.nOut ;
@@ -3182,7 +3185,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
                   ptVert = ptBr ;
                else if ( nEdge == 3)
                   ptVert = ptTR ;
-               AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptVert, plTrimmedPoly3d) ;
+               AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptVert, plTrimmedPoly3d, bForTriangulation) ;
                if ( nEdge > 3  &&  nEdge != 7)
                   nEdge = nEdge - 4 ;
                else if ( nEdge < 3)
@@ -3202,6 +3205,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
                for ( int p = 1 ; p < (int) vEdgeVertex[nEdge].size() ; ++ p) {
                   if ( CheckIfBefore( nEdge, vEdgeVertex[nEdge][p], m_mTree[nId].m_vInters[vToCheckNow[nNext]].vpt[0])) {
                      plTrimmedPoly.AddUPoint( c, vEdgeVertex[nEdge][p]) ;
+                     plTrimmedPoly3d.AddUPoint( c, vEdgeVertex3d[nEdge][p]) ;
                      ++ c ;
                   }
                }
@@ -3215,6 +3219,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
                for ( int p = 1 ; p < (int) vEdgeVertex[nEdge].size() ; ++ p) {
                   if ( CheckIfBefore( nEdge, vEdgeVertex[nEdge][p], ptStart)) {
                      plTrimmedPoly.AddUPoint( c, vEdgeVertex[nEdge][p]) ;
+                     plTrimmedPoly3d.AddUPoint( c, vEdgeVertex3d[nEdge][p]) ;
                      ++ c ;
                   }
                }
@@ -3236,7 +3241,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
                   ptVert = ptBr ;
                else if ( nEdge == 3)
                   ptVert = ptTR ;
-               AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptVert, plTrimmedPoly3d) ;
+               AddVertex( nId, vEdgeVertex, vEdgeVertex3d, plTrimmedPoly, c, ptVert, plTrimmedPoly3d, bForTriangulation) ;
                if ( nEdge > 3  &&  nEdge != 7)
                   nEdge = nEdge - 4 ;
                else if ( nEdge < 3)
@@ -3249,6 +3254,7 @@ Tree::CreateCellPolygons( int nLeafId, POLYLINEMATRIX& vPolygons, POLYLINEMATRIX
             for ( int p = 1 ; p < (int) vEdgeVertex[nEdge].size() ; ++ p) {
                if ( CheckIfBefore( nEdge, vEdgeVertex[nEdge][p], ptStart)) {
                   plTrimmedPoly.AddUPoint( c, vEdgeVertex[nEdge][p]) ;
+                  plTrimmedPoly3d.AddUPoint( c, vEdgeVertex3d[nEdge][p]) ;
                   ++ c ;
                }
             }
@@ -3579,11 +3585,9 @@ Tree::AreSameEdge( int nEdge1, int nEdge2) const
 
 //----------------------------------------------------------------------------
 bool
-Tree::AddVertex( int nId, const PNTMATRIX& vEdgeVertex, const PNTMATRIX& vEdgeVertex3d, PolyLine& plTrimmedPoly, int& c, const Point3d& ptToAdd, PolyLine& plTrimmedPoly3d) const
+Tree::AddVertex( int nId, const PNTMATRIX& vEdgeVertex, const PNTMATRIX& vEdgeVertex3d, PolyLine& plTrimmedPoly, int& c,
+                 const Point3d& ptToAdd, PolyLine& plTrimmedPoly3d, bool bForTriangulation) const
 {
-   //capisco se sono in modalità ForTriangulation
-   bool bForTriangulation = plTrimmedPoly3d.GetPointNbr() ;
-
   // se è il primo punto della PolyLine lo aggiungo
    if ( plTrimmedPoly.GetPointNbr() == 0) {
       plTrimmedPoly.AddUPoint( c, ptToAdd) ;
diff --git a/Tree.h b/Tree.h
index 1d0a45d..7d6a1e8 100644
--- a/Tree.h
+++ b/Tree.h
@@ -284,7 +284,8 @@ class Tree
       bool CheckIfBefore( int nEdge1, const Point3d& ptP1, int nEdge2, const Point3d& ptP2) const ; // verifico quale punto viene prima tra pt1 e pt2 a partire da ptTR girando in senso CCW (punto 1 su edge 1 e punto 2 su edge 2, rispetto al lato 3)
       bool CheckIfBefore( int nEdge, const Point3d& ptP1, const Point3d& ptP2, int nEdge2 = -1) const ; // sul lato nEdge controllo se ptP1 viene prima di ptP2.
       bool AreSameEdge( int nEdge1, int nEdge2) const ;  // indica se i due edge sono lo stesso. Un vertice adiacente ad un edge viene considerato uguale a questo edge
-      bool AddVertex( int nId, const PNTMATRIX& vEdgeVertex, const PNTMATRIX& vEdgeVertex3d, PolyLine& plTrimmedPoly, int& c, const Point3d& ptToAdd, PolyLine& plTrimmedPoly3d) const ;  // aggiunge un punto ad un poligono in una cella, premurandosi di aggiungere eventualmente vertici o punti di celle vicine di cui tenere conto
+      bool AddVertex( int nId, const PNTMATRIX& vEdgeVertex, const PNTMATRIX& vEdgeVertex3d, PolyLine& plTrimmedPoly, int& c,
+                      const Point3d& ptToAdd, PolyLine& plTrimmedPoly3d, bool ForTriangulation) const ;  // aggiunge un punto ad un poligono in una cella, premurandosi di aggiungere eventualmente vertici o punti di celle vicine di cui tenere conto
       bool SetRightEdgeIn( int nId) ;  // categorizza la cella in base all'edge destro per poter poi definire m_nFlag
       bool CategorizeCell( int nId) ;  // categorizza la cella in base al flag m_nFlag (dentro, fuori, intersecata)
       bool CheckIfBetween( const Inters& inA, const Inters& inB) const ; // / controllo se inB è compreso tra l'end e lo start di inA (in senso CCW)