diff --git a/Numeric/CondNumBasis.cpp b/Numeric/CondNumBasis.cpp
index e08e983b1071f891b93cad0b3e9b01854b30498e..67de0e0a32c77c7da6b0f92eff9b03586a5f8ba1 100644
--- a/Numeric/CondNumBasis.cpp
+++ b/Numeric/CondNumBasis.cpp
@@ -312,7 +312,7 @@ inline void calcGradInvCondNum3D(double dxdX, double dxdY, double dxdZ,
 
 
 CondNumBasis::CondNumBasis(int tag, int cnOrder) :
-    _dim(ElementType::DimensionFromTag(tag)),
+    _tag(tag), _dim(ElementType::DimensionFromTag(tag)),
     _condNumOrder(cnOrder >= 0 ? cnOrder : condNumOrder(tag))
 {
   if ( ElementType::ParentTypeFromTag(tag) == TYPE_TRIH){
@@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes,
     }
 
     case 3 : {
-      /*  FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
+      if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
         for (int i = 0; i < nCondNumNodes; i++) condNum(i) = 1.;
         break;
-        }*/
+      }
       fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3);
       gSMatX.mult(nodesXYZ, dxyzdX);
       gSMatY.mult(nodesXYZ, dxyzdY);
@@ -448,7 +448,7 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes,
         condNum(i) = calcInvCondNum3D<sign>(dxdX, dxdY, dxdZ,
                                             dydX, dydY, dydZ,
                                             dzdX, dzdY, dzdZ);
-     }
+      }
       break;
     }
   }
@@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
     }
 
     case 3 : {
-      /* FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
+      if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){
         for (int i = 0; i < nCondNumNodes; i++) {
           for (int j = 0; j < _nMapNodes; j++) {
             IDI(i,j) = 0.;
@@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
           IDI(i,3*_nMapNodes) = 1.;
         }
         break;
-        }*/
+      }
       fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3);
       gSMatX.mult(nodesXYZ, dxyzdX);
       gSMatY.mult(nodesXYZ, dxyzdY);
diff --git a/Numeric/CondNumBasis.h b/Numeric/CondNumBasis.h
index ab598583152232be8e5da12437ff8c83a4b281be..7ae2132af0e887b4f38027840712c95b8c609f75 100644
--- a/Numeric/CondNumBasis.h
+++ b/Numeric/CondNumBasis.h
@@ -15,7 +15,7 @@ class CondNumBasis {
  private:
   const GradientBasis *_gradBasis;
 
-  const int _dim, _condNumOrder;
+  const int _tag, _dim, _condNumOrder;
 
   fullVector<double> primGradShapeBarycenterX, primGradShapeBarycenterY,
                      primGradShapeBarycenterZ;