diff --git a/Source/func.f90 b/Source/func.f90
index 2a6b1ecce6d..0732873796a 100644
--- a/Source/func.f90
+++ b/Source/func.f90
@@ -4123,6 +4123,9 @@ SUBROUTINE PACK_BOUNDARY_COORD(NM,IC,RC,OS,BC_INDEX,UNPACK_IT,COUNT_ONLY)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%II,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%JJ,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%KK,UNPACK_IT)
+IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%II2,UNPACK_IT)
+IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%JJ2,UNPACK_IT)
+IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%KK2,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%IIG,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%JJG,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),BC%KKG,UNPACK_IT)
diff --git a/Source/type.f90 b/Source/type.f90
index 5a41708b90b..1e3d3f6ba98 100644
--- a/Source/type.f90
+++ b/Source/type.f90
@@ -187,9 +187,12 @@ MODULE TYPES
 
 TYPE BOUNDARY_COORD_TYPE
 
-   INTEGER :: II,II2         !< Ghost cells x index
-   INTEGER :: JJ,JJ2         !< Ghost cells y index
-   INTEGER :: KK,KK2         !< Ghost cells z index
+   INTEGER :: II             !< First ghost cell inside wall in the x direction
+   INTEGER :: JJ             !< First ghost cell inside wall in the y direction
+   INTEGER :: KK             !< First ghost cell inside wall in the z direction
+   INTEGER :: II2            !< Second ghost cell, x direction
+   INTEGER :: JJ2            !< Second ghost cell, y direction
+   INTEGER :: KK2            !< Second ghost cell, z direction
    INTEGER :: IIG            !< Gas cell x index
    INTEGER :: JJG            !< Gas cell y index
    INTEGER :: KKG            !< Gas cell z index