diff --git a/dumux/discretization/box/fourierslawnonequilibrium.hh b/dumux/discretization/box/fourierslawnonequilibrium.hh
index ee9fca8d306c40d8f5a1b3c805fd0816b84c3e3f..5cb128deee82ab0ecf6b8109230d51780d0d0291 100644
--- a/dumux/discretization/box/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/box/fourierslawnonequilibrium.hh
@@ -63,7 +63,7 @@ class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::box
 
     enum { dim = GridView::dimension} ;
     enum { dimWorld = GridView::dimensionworld} ;
-    enum { numPhases = GetPropType<TypeTag, Properties::ModelTraits>::numPhases()} ;
+
     enum { numEnergyEqFluid = getPropValue<TypeTag, Properties::NumEnergyEqFluid>() };
     enum {sPhaseIdx = FluidSystem::numPhases};
 
@@ -88,8 +88,9 @@ public:
        // effective diffusion tensors
         if (phaseIdx != sPhaseIdx)
         {
-           if (numEnergyEqFluid == 1)
-            {   //when only one energy equation for fluids is used, we need an effective law for that
+            //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+            if (numEnergyEqFluid < FluidSystem::numPhases)
+            {
                 insideLambda += ThermalConductivityModel::effectiveThermalConductivity(insideVolVars, problem.spatialParams(), element, fvGeometry, insideScv);
                 outsideLambda += ThermalConductivityModel::effectiveThermalConductivity(outsideVolVars, problem.spatialParams(), element, fvGeometry, outsideScv);
             }
diff --git a/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh b/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
index 97e47eec01e4c44f388663736c6e408c2698fe65..f2c6e4acdbc67e21cb0e3bdd71435405919f2a7b 100644
--- a/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
@@ -121,8 +121,9 @@ public:
         // effective diffusion tensors
         if (phaseIdx != sPhaseIdx)
         {
-           if (numEnergyEqFluid == 1)
-            {   //when only one energy equation for fluids is used, we need an effective law for that
+            //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+           if (numEnergyEqFluid < FluidSystem::numPhases)
+            {
                 insideLambda += ThermalConductivityModel::effectiveThermalConductivity(insideVolVars, problem.spatialParams(), element, fvGeometry, insideScv);
             }
             else //numEnergyEqFluid >1
@@ -153,8 +154,9 @@ public:
        // effective diffusion tensors
         if (phaseIdx != sPhaseIdx)
         {
-           if (numEnergyEqFluid == 1)
-            {   //when only one energy equation for fluids is used, we need an effective law for that
+            //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+           if (numEnergyEqFluid < FluidSystem::numPhases)
+            {
                 outsideLambda += ThermalConductivityModel::effectiveThermalConductivity(outsideVolVars, problem.spatialParams(), element, fvGeometry, outsideScv);
             }
             else