diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
index 023db63cd8..317e87b770 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@@ -27,7 +27,7 @@ License
 #include "thermophysicalTransportModel.H"
 #include "solidThermo.H"
 #include "surfaceInterpolate.H"
-#include "fvcSnGrad.H"
+#include "fvcGrad.H"
 #include "wallPolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -59,11 +59,7 @@ void Foam::functionObjects::wallHeatFlux::writeFileHeader(const label i)
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::functionObjects::wallHeatFlux::calcWallHeatFlux
-(
-    const volScalarField& alpha,
-    const volScalarField& he
-)
+Foam::functionObjects::wallHeatFlux::calcWallHeatFlux(const volVectorField& q)
 {
     tmp<volScalarField> twallHeatFlux
     (
@@ -78,14 +74,16 @@ Foam::functionObjects::wallHeatFlux::calcWallHeatFlux
     volScalarField::Boundary& wallHeatFluxBf =
         twallHeatFlux.ref().boundaryFieldRef();
 
-    const volScalarField::Boundary& heBf = he.boundaryField();
-    const volScalarField::Boundary& alphaBf = alpha.boundaryField();
+    const volVectorField::Boundary& qBf = q.boundaryField();
 
     forAllConstIter(labelHashSet, patchSet_, iter)
     {
         const label patchi = iter.key();
 
-        wallHeatFluxBf[patchi] = alphaBf[patchi]*heBf[patchi].snGrad();
+        const vectorField& Sfp = mesh_.Sf().boundaryField()[patchi];
+        const scalarField& magSfp = mesh_.magSf().boundaryField()[patchi];
+
+        wallHeatFluxBf[patchi] = (-Sfp/magSfp) & qBf[patchi];
     }
 
     if (foundObject<volScalarField>("qr"))
@@ -211,7 +209,7 @@ bool Foam::functionObjects::wallHeatFlux::execute()
         return store
         (
             name,
-            calcWallHeatFlux(ttm.alphaEff(), ttm.thermo().he())
+            calcWallHeatFlux(ttm.q())
         );
     }
     else if (foundObject<solidThermo>(solidThermo::dictName))
@@ -219,7 +217,11 @@ bool Foam::functionObjects::wallHeatFlux::execute()
         const solidThermo& thermo =
             lookupObject<solidThermo>(solidThermo::dictName);
 
-        return store(name, calcWallHeatFlux(thermo.alpha(), thermo.he()));
+        return store
+        (
+            name,
+            calcWallHeatFlux(-thermo.alpha()*fvc::grad(thermo.he()))
+        );
     }
     else
     {
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
index 6f55b052b3..192455a889 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
@@ -108,11 +108,7 @@ protected:
         virtual void writeFileHeader(const label i);
 
         //- Calculate the heat-flux
-        tmp<volScalarField> calcWallHeatFlux
-        (
-            const volScalarField& alpha,
-            const volScalarField& he
-        );
+        tmp<volScalarField> calcWallHeatFlux(const volVectorField& q);
 
 
 public:
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index 56c68f15da..22ce4af7ac 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -82,9 +82,8 @@ Foam::functionObjects::wallShearStress::calcShearStress
 
         const vectorField& Sfp = mesh_.Sf().boundaryField()[patchi];
         const scalarField& magSfp = mesh_.magSf().boundaryField()[patchi];
-        const symmTensorField& taup = tau.boundaryField()[patchi];
 
-        wallShearStressBf[patchi] = (-Sfp/magSfp) & taup;
+        wallShearStressBf[patchi] = (-Sfp/magSfp) & tau.boundaryField()[patchi];
     }
 
     return twallShearStress;