diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
index 08ca21459..377707fed 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
@@ -103,7 +103,11 @@ void Foam::fixedEnthalpyFvPatchScalarField::updateCoeffs()
         const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
     Tw.evaluate();
 
-    if (dimensionedInternalField().name() == db().mangleFileName("h"))
+    if
+    (
+        dimensionedInternalField().name() == db().mangleFileName("h")
+     || dimensionedInternalField().name() == db().mangleFileName("i")
+    )
     {
         operator==(thermo.h(Tw, patchi));
     }
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
index 0d9914f48..282415cd4 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
@@ -104,7 +104,11 @@ void Foam::gradientEnthalpyFvPatchScalarField::updateCoeffs()
 
     Tw.evaluate();
 
-    if (dimensionedInternalField().name() == db().mangleFileName("h"))
+    if
+    (
+        dimensionedInternalField().name() == db().mangleFileName("h")
+     || dimensionedInternalField().name() == db().mangleFileName("i")
+    )
     {
         gradient() = thermo.Cp(Tw, patchi)*Tw.snGrad()
         + patch().deltaCoeffs()*
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
index ce58ff095..d6c2d1c12 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
@@ -112,7 +112,11 @@ void Foam::mixedEnthalpyFvPatchScalarField::updateCoeffs()
 
     valueFraction() = Tw.valueFraction();
 
-    if (dimensionedInternalField().name() == db().mangleFileName("h"))
+    if
+    (
+        dimensionedInternalField().name() == db().mangleFileName("h")
+     || dimensionedInternalField().name() == db().mangleFileName("i")
+    )
     {
         refValue() = thermo.h(Tw.refValue(), patchi);
         refGrad() = thermo.Cp(Tw, patchi)*Tw.refGrad()