diff --git a/src/encounter/encounter_io.f90 b/src/encounter/encounter_io.f90
index 39c1c84cd..8df13d35c 100644
--- a/src/encounter/encounter_io.f90
+++ b/src/encounter/encounter_io.f90
@@ -169,24 +169,24 @@ module subroutine encounter_io_write_frame(self, iu, param)
       n = int(self%nenc, kind=I4B)
       call check( nf90_set_fill(iu%ncid, nf90_nofill, old_mode), "encounter_io_write_frame_base nf90_set_fill"  )
       call check( nf90_put_var(iu%ncid, iu%time_varid, self%t, start=[i]), "netcdf_write_hdr_system nf90_put_var time_varid"  )
-      call check( nf90_put_var(iu%ncid, iu%xhx_varid, self%x1(1, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var xhx_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%xhy_varid, self%x1(2, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var xhy_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%xhz_varid, self%x1(3, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var xhz_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%xhx_varid, self%x2(1, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var xhx_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%xhy_varid, self%x2(2, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var xhy_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%xhz_varid, self%x2(3, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var xhz_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%vhx_varid, self%v1(1, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var vhx_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%vhy_varid, self%v1(2, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var vhy_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%vhz_varid, self%v1(3, :), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var vhz_varid 1"  )
-      call check( nf90_put_var(iu%ncid, iu%vhx_varid, self%v2(1, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var vhx_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%vhy_varid, self%v2(2, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var vhy_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%vhz_varid, self%v2(3, :), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var vhz_varid 2"  )
-      call check( nf90_put_var(iu%ncid, iu%name_varid, self%name1(:), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var name 1"  )
-      call check( nf90_put_var(iu%ncid, iu%name_varid, self%name2(:), start=[1, 2, i]), "netcdf_write_frame_base nf90_put_var name 2"  )
-      call check( nf90_put_var(iu%ncid, iu%Gmass_varid, self%Gmass1(:), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var Gmass 1"  )
-      call check( nf90_put_var(iu%ncid, iu%Gmass_varid, self%Gmass2(:), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var Gmass 2"  )
-      call check( nf90_put_var(iu%ncid, iu%radius_varid, self%radius1(:), start=[1, 1, i]), "netcdf_write_frame_base nf90_put_var radius 1"  )
-      call check( nf90_put_var(iu%ncid, iu%radius_varid, self%radius2(:), start=[2, 1, i]), "netcdf_write_frame_base nf90_put_var radius 2"  )
+      call check( nf90_put_var(iu%ncid, iu%xhx_varid, self%x1(1, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhx_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%xhy_varid, self%x1(2, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhy_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%xhz_varid, self%x1(3, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhz_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%xhx_varid, self%x2(1, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhx_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%xhy_varid, self%x2(2, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhy_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%xhz_varid, self%x2(3, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var xhz_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%vhx_varid, self%v1(1, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhx_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%vhy_varid, self%v1(2, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhy_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%vhz_varid, self%v1(3, :), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhz_varid 1"  )
+      call check( nf90_put_var(iu%ncid, iu%vhx_varid, self%v2(1, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhx_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%vhy_varid, self%v2(2, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhy_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%vhz_varid, self%v2(3, :), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var vhz_varid 2"  )
+      call check( nf90_put_var(iu%ncid, iu%name_varid, self%name1(:), start=[1, 1, i], count=[NAMELEN,1,1]), "netcdf_write_frame_base nf90_put_var name 1"  )
+      call check( nf90_put_var(iu%ncid, iu%name_varid, self%name2(:), start=[1, 2, i], count=[NAMELEN,1,1]), "netcdf_write_frame_base nf90_put_var name 2"  )
+      call check( nf90_put_var(iu%ncid, iu%Gmass_varid, self%Gmass1(:), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var Gmass 1"  )
+      call check( nf90_put_var(iu%ncid, iu%Gmass_varid, self%Gmass2(:), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var Gmass 2"  )
+      call check( nf90_put_var(iu%ncid, iu%radius_varid, self%radius1(:), start=[1, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var radius 1"  )
+      call check( nf90_put_var(iu%ncid, iu%radius_varid, self%radius2(:), start=[2, 1, i], count=[1,n,1]), "netcdf_write_frame_base nf90_put_var radius 2"  )
                  
 
       return
diff --git a/src/symba/symba_encounter_check.f90 b/src/symba/symba_encounter_check.f90
index 60febb3fe..f07119dba 100644
--- a/src/symba/symba_encounter_check.f90
+++ b/src/symba/symba_encounter_check.f90
@@ -34,7 +34,7 @@ module function symba_encounter_check_pl(self, param, system, dt, irec) result(l
       lany_encounter = .false.
       if (self%nbody == 0) return
 
-      associate(pl => self, plplenc_list => system%plplenc_list, cb => system%cb, ienc_frame => system%ienc_frame, encounter_history => system%encounter_history)
+      associate(pl => self, plplenc_list => system%plplenc_list, cb => system%cb, ienc_frame => system%ienc_frame)
 
          npl = pl%nbody
          nplm = pl%nplm
@@ -89,7 +89,7 @@ module function symba_encounter_check_pl(self, param, system, dt, irec) result(l
             end do
             ienc_frame = ienc_frame + 1
             call system%resize_storage(ienc_frame)
-            encounter_history%frame(ienc_frame) = plplenc_list
+            system%encounter_history%frame(ienc_frame) = plplenc_list
          end if
 
       end associate