diff --git a/Source/geom.f90 b/Source/geom.f90
index 79a2b172913..e3a066a4029 100644
--- a/Source/geom.f90
+++ b/Source/geom.f90
@@ -8877,7 +8877,7 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB,
 
          ! External mesh boundary CFACES inherit the underlaying WALL type.
          CFA%BOUNDARY_TYPE = WC%BOUNDARY_TYPE
-         CFA%NODE_INDEX    = BOUNDARY_PROP1(WC%B1_INDEX)%NODE_INDEX
+         CFA%NODE_INDEX    = SURFACE(WC%SURF_INDEX)%NODE_INDEX
 
          BC%II = WC_BC%II
          BC%JJ = WC_BC%JJ