diff --git a/src/mesh/Connectivity.cpp b/src/mesh/Connectivity.cpp
index 5ea41281219fd8a4e8643c1c3974a8e7ddadf9ae..48db775ebcde1f44e67113af7c37f51950a94cd0 100644
--- a/src/mesh/Connectivity.cpp
+++ b/src/mesh/Connectivity.cpp
@@ -14,8 +14,8 @@ void Connectivity<3>::_computeFaceCellConnectivities()
   for (unsigned int j=0; j<this->numberOfCells(); ++j) {
     const auto& cell_nodes = cell_to_node_matrix.rowConst(j);
 
-    switch (cell_nodes.length) {
-      case 4: { // tetrahedron
+    switch (m_cell_type[j]) {
+      case CellType::Tetrahedron: {
         cell_nb_faces[j] = 4;
         // face 0
         Face f0({cell_nodes(1),
@@ -42,7 +42,7 @@ void Connectivity<3>::_computeFaceCellConnectivities()
         face_cells_map[f3].emplace_back(std::make_tuple(j, 3, f3.reversed()));
         break;
       }
-      case 8: { // hexahedron
+      case CellType::Hexahedron: {
         // face 0
         Face f0({cell_nodes(3),
                  cell_nodes(2),