--- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
@@ -3,7 +3,36 @@
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*UEqn.H();
 
-if (realFluid)
+if (transonic)
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)
+       *(
+            (fvc::interpolate(U) & mesh.Sf())
+          + fvc::ddtPhiCorr(rUA, rho, U, phi)
+        )
+    );
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          - fvm::laplacian(rho*rUA, p)
+        );
+
+        pEqn.solve();
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi == pEqn.flux();
+        }
+    }
+}
+else
 {
     phi =
         fvc::interpolate(rho)*
@@ -16,8 +45,7 @@
     {
         fvScalarMatrix pEqn
         (
-            psi*fvm::ddt(p)
-          + drhodh*fvc::ddt(h)
+            fvm::ddt(psi, p)
           + fvc::div(phi)
           - fvm::laplacian(rho*rUA, p)
         );
@@ -30,64 +58,6 @@
         }
     }
 }
-else
-{
-    if (transonic)
-    {
-        surfaceScalarField phid
-        (
-            "phid",
-            fvc::interpolate(psi)
-           *(
-                (fvc::interpolate(U) & mesh.Sf())
-               + fvc::ddtPhiCorr(rUA, rho, U, phi)
-            )
-        );
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-        {
-            fvScalarMatrix pEqn
-            (
-                fvm::ddt(psi, p)
-              + fvm::div(phid, p)
-              - fvm::laplacian(rho*rUA, p)
-            );
-
-            pEqn.solve();
-
-            if (nonOrth == nNonOrthCorr)
-            {
-                phi == pEqn.flux();
-            }
-        }
-    }
-    else
-    {
-        phi =
-        fvc::interpolate(rho)*
-        (
-            (fvc::interpolate(U) & mesh.Sf())
-          + fvc::ddtPhiCorr(rUA, rho, U, phi)
-        );
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-        {
-            fvScalarMatrix pEqn
-            (
-                fvm::ddt(psi, p)
-              + fvc::div(phi)
-              - fvm::laplacian(rho*rUA, p)
-            );
-
-            pEqn.solve();
-
-            if (nonOrth == nNonOrthCorr)
-            {
-                phi += pEqn.flux();
-            }
-        }
-    }
-}
 
 #include "rhoEqn.H"
 #include "compressibleContinuityErrs.H"