diff --git a/Source/wall.f90 b/Source/wall.f90
index 0e41a85bc47..f2723c73720 100644
--- a/Source/wall.f90
+++ b/Source/wall.f90
@@ -494,6 +494,7 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
             BBB,CCC,PPP,QQQ,RRR,UUU,YYY,WWW,HTC_OLD,RSC_LOC,DTMP,RSUM_G,MU_G
 LOGICAL :: ATMOSPHERIC_INTERPOLATION
 INTEGER :: IIO,JJO,KKO,N,ADCOUNT
+REAL(EB), POINTER, DIMENSION(:,:,:) :: OM_RHOP
 REAL(EB), POINTER, DIMENSION(:,:,:,:) :: OM_ZZP
 REAL(EB), POINTER, DIMENSION(:,:,:) :: OM_MUP
 TYPE(EXTERNAL_WALL_TYPE), POINTER :: EWC
@@ -507,7 +508,6 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
 TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
 TYPE(LAGRANGIAN_PARTICLE_TYPE), POINTER :: LP
 TYPE(LAGRANGIAN_PARTICLE_CLASS_TYPE), POINTER :: LPC
-REAL(EB), POINTER, DIMENSION(:,:,:) :: OM_RHOP
 TYPE(PROPERTY_TYPE), POINTER :: PY
 
 IF (PRESENT(WALL_INDEX)) THEN
@@ -698,6 +698,13 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
       EWC => EXTERNAL_WALL(WALL_INDEX)
       OM => OMESH(EWC%NOM)
       MM => MESHES(EWC%NOM)
+      IF (PREDICTOR) THEN
+         OM_RHOP => OM%RHOS
+         OM_ZZP => OM%ZZS
+      ELSE
+         OM_RHOP => OM%RHO
+         OM_ZZP => OM%ZZ
+      ENDIF
 
       ! interp or extrap RHO_OTHER for jump in vertical grid resolution, linear in temperature to match heat flux in divg