diff --git a/Triangulation/TODO b/Triangulation/TODO
index 55681af64c2..ef0cca92e51 100644
--- a/Triangulation/TODO
+++ b/Triangulation/TODO
@@ -106,6 +106,8 @@ __________________________________________________________________________ALL
 
 _________________________________________________TRIANGULATION_DATA_STRUCTURE
 
+*) Un-recursify insert_in_tagged_hole : crashed in dimension 8 : stack overflow.
+
 *) TriangulationDataStructure:
   - Should we put >> and << in the documentation of the class
     Triangulation_data_structure ?
diff --git a/Triangulation/include/CGAL/Triangulation_face.h b/Triangulation/include/CGAL/Triangulation_face.h
index 6f7059c13de..4720dd5e006 100644
--- a/Triangulation/include/CGAL/Triangulation_face.h
+++ b/Triangulation/include/CGAL/Triangulation_face.h
@@ -38,14 +38,14 @@ protected:
 
 public:
     explicit Triangulation_face(Full_cell_handle s) /* Concept */
-    : full_cell_(s), indices_(s->ambient_dimension()+1)
+    : full_cell_(s), indices_(s->ambient_dimension()+1) // FIXME: +2 to allow for arbitrary dimensioned Face
     {
         CGAL_assertion( Full_cell_handle() != s );
         clear();
     }
 
     explicit Triangulation_face(const int ambient_dim) /* Concept */
-    : full_cell_(), indices_(ambient_dim+1)
+    : full_cell_(), indices_(ambient_dim+1) // FIXME: +2 to allow for arbitrary dimensioned Face
     {
         clear();
     }
diff --git a/Triangulation/include/CGAL/internal/Combination_enumerator.h b/Triangulation/include/CGAL/internal/Combination_enumerator.h
index 16c83d18cf1..1d68a6e9d45 100644
--- a/Triangulation/include/CGAL/internal/Combination_enumerator.h
+++ b/Triangulation/include/CGAL/internal/Combination_enumerator.h
@@ -47,6 +47,11 @@ public:
     : k_(c.k_), min_(c.min_), max_(c.max_), combi_(c.combi_)
     {}
 
+    int number_of_elements()
+    {
+        return k_;
+    }
+
     void init()
     {
         combi_.resize(k_);
@@ -96,7 +101,7 @@ public:
         if( -1 == i )
         {
             if( element(0) == max_at_pos(0) )
-                ++element(0);
+                ++element(0); // mark then end of the enumeration with an impossible value
         }
         else
         {