diff --git a/dumux/freeflow/stokesnc/stokesncmodel.hh b/dumux/freeflow/stokesnc/stokesncmodel.hh
index 058115ba39c537d02fb4434ae58f8bf7f4bc12a9..fbb93188f3efb705c05822afc5cc289edd0cf843 100644
--- a/dumux/freeflow/stokesnc/stokesncmodel.hh
+++ b/dumux/freeflow/stokesnc/stokesncmodel.hh
@@ -151,8 +151,8 @@ public:
                 delP[globalIdx] = volVars.pressure()*scale_ - 1e5;
 				for (int compIdx = 0; compIdx < numComponents; ++compIdx)
                     {
-                        (*moleFraction[compIdx])[globalIdx]= volVars.fluidState().moleFraction(phaseIdx,compIdx);
-						(*massFraction[compIdx])[globalIdx]= volVars.fluidState().massFraction(phaseIdx,compIdx);
+                        (*moleFraction[compIdx])[globalIdx]= volVars.moleFraction(phaseIdx,compIdx);
+						(*massFraction[compIdx])[globalIdx]= volVars.massFraction(phaseIdx,compIdx);
                         Valgrind::CheckDefined((*moleFraction[compIdx])[globalIdx]);
 						Valgrind::CheckDefined((*massFraction[compIdx])[globalIdx]);
 					}
diff --git a/dumux/freeflow/stokesncni/stokesncnimodel.hh b/dumux/freeflow/stokesncni/stokesncnimodel.hh
index f191da2a31d41f75f851cd7e368e683dc4c2bb47..a5aafeae673c1441a2ef47171381bcfd72f1c274 100644
--- a/dumux/freeflow/stokesncni/stokesncnimodel.hh
+++ b/dumux/freeflow/stokesncni/stokesncnimodel.hh
@@ -156,8 +156,8 @@ public:
                 delP[globalIdx] = volVars.pressure()*scale_ - 1e5;
 				for (int compIdx = 0; compIdx < numComponents; ++compIdx)
 				{
-					(*moleFraction[compIdx])[globalIdx]= volVars.fluidState().moleFraction(phaseIdx,compIdx);
-					(*massFraction[compIdx])[globalIdx]= volVars.fluidState().massFraction(phaseIdx,compIdx);
+					(*moleFraction[compIdx])[globalIdx]= volVars.moleFraction(phaseIdx,compIdx);
+					(*massFraction[compIdx])[globalIdx]= volVars.massFraction(phaseIdx,compIdx);
 					Valgrind::CheckDefined((*moleFraction[compIdx])[globalIdx]);
 					Valgrind::CheckDefined((*massFraction[compIdx])[globalIdx]);
 				}
diff --git a/dumux/implicit/2p2c/2p2cfluxvariables.hh b/dumux/implicit/2p2c/2p2cfluxvariables.hh
index 9b0a0919f23ef25ebd1f46f82f9fcc7c8e373456..266ce7382b99f2d4a15148d7c4d4a88cb3dd962d 100644
--- a/dumux/implicit/2p2c/2p2cfluxvariables.hh
+++ b/dumux/implicit/2p2c/2p2cfluxvariables.hh
@@ -143,12 +143,12 @@ class TwoPTwoCFluxVariables : public GET_PROP_TYPE(TypeTag, BaseFluxVariables)
 
             // the mole fraction gradient of the wetting phase
             tmp = feGrad;
-            tmp *= elemVolVars[volVarsIdx].fluidState().moleFraction(wPhaseIdx, nCompIdx);
+            tmp *= elemVolVars[volVarsIdx].moleFraction(wPhaseIdx, nCompIdx);
             moleFractionGrad_[wPhaseIdx] += tmp;
 
             // the mole fraction gradient of the non-wetting phase
             tmp = feGrad;
-            tmp *= elemVolVars[volVarsIdx].fluidState().moleFraction(nPhaseIdx, wCompIdx);
+            tmp *= elemVolVars[volVarsIdx].moleFraction(nPhaseIdx, wCompIdx);
             moleFractionGrad_[nPhaseIdx] += tmp;
         }
     }