diff --git a/Source/part.f90 b/Source/part.f90
index e76bd3e4540..699cf7e743c 100644
--- a/Source/part.f90
+++ b/Source/part.f90
@@ -529,9 +529,8 @@ SUBROUTINE INSERT_SPRAY_PARTICLES
          ELSE
             CALL GET_IJK(BC%X,BC%Y,BC%Z,NM,XI,YJ,ZK,II,JJ,KK)
             IC = CELL_INDEX(II,JJ,KK)
-            BC%IIG = II
-            BC%JJG = JJ
-            BC%KKG = KK
+            BC%IIG = II; BC%JJG = JJ; BC%KKG = KK
+            BC%II  = II; BC%JJ  = JJ; BC%KK  = KK
             IF (.NOT.CELL(IC)%SOLID) EXIT CHOOSE_COORDS
          ENDIF
 
@@ -865,6 +864,7 @@ SUBROUTINE PARTICLE_FACE_INSERT(WALL_INDEX,CFACE_INDEX)
 
          ! Update idicies in case offset puts location in a different cell
          CALL GET_IJK(BC%X,BC%Y,BC%Z,NM,XI,YJ,ZK,BC%IIG,BC%JJG,BC%KKG)
+         BC%II = BC%IIG; BC%JJ = BC%JJG; BC%KK = BC%KKG
 
          ! Save the insertion time (TP) and scalar property (SP) for the particle
 
@@ -1472,9 +1472,8 @@ SUBROUTINE VOLUME_INIT_PARTICLE
 INTEGER :: ND
 TYPE (PROFILE_TYPE), POINTER :: PF
 
-BC%IIG = II
-BC%JJG = JJ
-BC%KKG = KK
+BC%IIG = II; BC%JJG = JJ; BC%KKG = KK
+BC%II  = II; BC%JJ  = JJ; BC%KK  = KK
 LP%U = IN%U0
 LP%V = IN%V0
 LP%W = IN%W0
@@ -1886,6 +1885,7 @@ SUBROUTINE MOVE_PARTICLES(T,DT,NM)
          IF (LP%PATH_PARTICLE) THEN
             CALL MOVE_IN_GAS
             CALL GET_IJK(BC%X,BC%Y,BC%Z,NM,XI,YJ,ZK,BC%IIG,BC%JJG,BC%KKG)
+            BC%II = BC%IIG; BC%JJ = BC%JJG; BC%KK = BC%KKG
          ENDIF
          EXIT TIME_STEP_LOOP
       ENDIF
@@ -1939,6 +1939,7 @@ SUBROUTINE MOVE_PARTICLES(T,DT,NM)
       ! Determine the cell indices of the new particle location.
 
       CALL GET_IJK(BC%X,BC%Y,BC%Z,NM,XI,YJ,ZK,BC%IIG,BC%JJG,BC%KKG)
+      BC%II = BC%IIG; BC%JJ = BC%JJG; BC%KK = BC%KKG
 
       ! If the particle is not near a boundary cell, cycle.
 
@@ -2520,6 +2521,7 @@ SUBROUTINE MOVE_PARTICLES(T,DT,NM)
 
       ! Store containing volume at new location
       CALL GET_IJK(BC%X,BC%Y,BC%Z,NM,XI,YJ,ZK,BC%IIG,BC%JJG,BC%KKG)
+      BC%II = BC%IIG; BC%JJ = BC%JJG; BC%KK = BC%KKG
       CALL GET_RVC(NM,BC%IIG,BC%JJG,BC%KKG,LP%RVC)
 
    ENDDO TIME_STEP_LOOP