diff --git a/src/post_process/m_data_input.f90 b/src/post_process/m_data_input.f90
index ade96cd27b..0a09826072 100644
--- a/src/post_process/m_data_input.f90
+++ b/src/post_process/m_data_input.f90
@@ -392,7 +392,7 @@ subroutine s_read_parallel_data_files(t_step) ! ---------------------------
                                                MPI_DOUBLE_PRECISION, status, ierr)
                     end do
                 else
-                    do i = 1, adv_idx%end
+                    do i = 1, sys_size
                         var_MOK = int(i, MPI_OFFSET_KIND)
 
                         ! Initial displacement to skip at beginning of file
diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp
index 9d960b9957..bc4349c43f 100644
--- a/src/simulation/m_start_up.fpp
+++ b/src/simulation/m_start_up.fpp
@@ -690,7 +690,7 @@ contains
                         end do
                     end if
                 else
-                    do i = 1, adv_idx%end
+                    do i = 1, sys_size
                         var_MOK = int(i, MPI_OFFSET_KIND)
 
                         ! Initial displacement to skip at beginning of file