diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C
index d5038d1f69..4183045a10 100644
--- a/applications/solvers/combustion/chemFoam/chemFoam.C
+++ b/applications/solvers/combustion/chemFoam/chemFoam.C
@@ -69,14 +69,9 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "solveChemistry.H"
-
-        {
-            #include "YEqn.H"
-
-            #include "hEqn.H"
-
-            #include "pEqn.H"
-        }
+        #include "YEqn.H"
+        #include "hEqn.H"
+        #include "pEqn.H"
 
         #include "output.H"
 
diff --git a/applications/solvers/combustion/chemFoam/hEqn.H b/applications/solvers/combustion/chemFoam/hEqn.H
index 2478e6017c..4dd593ea9e 100644
--- a/applications/solvers/combustion/chemFoam/hEqn.H
+++ b/applications/solvers/combustion/chemFoam/hEqn.H
@@ -9,4 +9,6 @@
     {
         h[0] = h0 + integratedHeat;
     }
+
+    thermo.correct();
 }
diff --git a/applications/solvers/combustion/chemFoam/pEqn.H b/applications/solvers/combustion/chemFoam/pEqn.H
index 13f3d603ae..a919ff198c 100644
--- a/applications/solvers/combustion/chemFoam/pEqn.H
+++ b/applications/solvers/combustion/chemFoam/pEqn.H
@@ -1,5 +1,4 @@
 {
-    thermo.correct();
     rho = thermo.rho();
     if (constProp == "volume")
     {