diff --git a/src/cipsi/run_pt2_slave.irp.f b/src/cipsi/run_pt2_slave.irp.f
index debae596..cb1dd1f5 100644
--- a/src/cipsi/run_pt2_slave.irp.f
+++ b/src/cipsi/run_pt2_slave.irp.f
@@ -186,6 +186,7 @@ subroutine run_pt2_slave_large(thread,iproc,energy)
   type(pt2_type) :: pt2_data
   integer :: n_tasks, k, N
   integer :: i_generator, subset
+  integer :: ifirst
 
   integer :: bsize ! Size of selection buffers
   logical :: sending
@@ -202,6 +203,7 @@ subroutine run_pt2_slave_large(thread,iproc,energy)
 
   zmq_socket_push      = new_zmq_push_socket(thread)
 
+  ifirst = 0
   b%N = 0
   buffer_ready = .False.
   n_tasks = 1
@@ -250,7 +252,11 @@ subroutine run_pt2_slave_large(thread,iproc,energy)
     call omp_set_lock(global_selection_buffer_lock)
     global_selection_buffer%mini = b%mini
     call merge_selection_buffers(b,global_selection_buffer)
-    b%cur=0
+    if (ifirst /= 0 ) then
+      b%cur=0
+    else
+      ifirst = 1
+    endif
     call omp_unset_lock(global_selection_buffer_lock)
     if ( iproc == 1 ) then
       call omp_set_lock(global_selection_buffer_lock)
diff --git a/src/tools/diagonalize_h.irp.f b/src/tools/diagonalize_h.irp.f
index c9ae2033..ffc53aa2 100644
--- a/src/tools/diagonalize_h.irp.f
+++ b/src/tools/diagonalize_h.irp.f
@@ -20,4 +20,5 @@ subroutine routine
  call diagonalize_CI
  print*,'N_det = ',N_det
  call save_wavefunction_general(N_det,N_states,psi_det_sorted,size(psi_coef_sorted,1),psi_coef_sorted)
+ call print_mol_properties
 end
diff --git a/src/tools/print_energy.irp.f b/src/tools/print_energy.irp.f
index 4fe1572c..0e67828e 100644
--- a/src/tools/print_energy.irp.f
+++ b/src/tools/print_energy.irp.f
@@ -14,5 +14,6 @@ end
 
 subroutine run
  implicit none
-  print *,  psi_energy + nuclear_repulsion
+ call print_mol_properties
+ print *,  psi_energy + nuclear_repulsion
 end