diff --git a/src/particle_restart_write.F90 b/src/particle_restart_write.F90
index 9cb371872f..8b2e7a9012 100644
--- a/src/particle_restart_write.F90
+++ b/src/particle_restart_write.F90
@@ -51,7 +51,8 @@ contains
     type(Bank), pointer     :: src => null()
 
     ! set up file name
-    filename = trim(path_output) // 'particle_'//trim(to_str(rank))//'.h5'
+    filename = trim(path_output) // 'particle_' // trim(to_str(current_batch)) &
+         // '_' // trim(to_str(current_work)) // '.h5'
 
     ! create hdf5 file
     call h5fcreate_f(filename, H5F_ACC_TRUNC_F, hdf5_particle_file, hdf5_err)
@@ -90,7 +91,8 @@ contains
     type(Bank), pointer     :: src => null()
 
     ! set up file name
-    filename = trim(path_output) // 'particle_'//trim(to_str(rank))//'.binary'
+    filename = trim(path_output) // 'particle_' // trim(to_str(current_batch)) &
+         // '_' // trim(to_str(current_work)) // '.binary'
 
     ! create hdf5 file
     open(UNIT=UNIT_PARTICLE, FILE=filename, STATUS='replace', &