diff --git a/plugins/Full_CI_ZMQ/pt2_stoch_routines.irp.f b/plugins/Full_CI_ZMQ/pt2_stoch_routines.irp.f
index 4d92e304..2f85cc00 100644
--- a/plugins/Full_CI_ZMQ/pt2_stoch_routines.irp.f
+++ b/plugins/Full_CI_ZMQ/pt2_stoch_routines.irp.f
@@ -332,7 +332,7 @@ subroutine pt2_collector(zmq_socket_pull, E, b, tbc, comb, Ncomb, computed, pt2_
             print *, irp_here, ': Error in sending abort signal (1)'
           endif
         endif
-        exit pullLoop
+!        exit pullLoop
       endif
      
       E0 = sum(pt2_detail(pt2_stoch_istate,:first_det_of_teeth(tooth)-1))
@@ -366,13 +366,6 @@ subroutine pt2_collector(zmq_socket_pull, E, b, tbc, comb, Ncomb, computed, pt2_
     end if
   end do pullLoop
 
-  if (zmq_abort(zmq_to_qp_run_socket) == -1) then
-    call sleep(1)
-    if (zmq_abort(zmq_to_qp_run_socket) == -1) then
-      print *, irp_here, ': Error in sending abort signal (2)'
-    endif
-  endif
-
   if(tooth == comb_teeth+1) then
     pt2(pt2_stoch_istate) = sum(pt2_detail(pt2_stoch_istate,:))
     error(pt2_stoch_istate) = 0d0
diff --git a/src/ZMQ/utils.irp.f b/src/ZMQ/utils.irp.f
index a77f974a..3fbc842b 100644
--- a/src/ZMQ/utils.irp.f
+++ b/src/ZMQ/utils.irp.f
@@ -246,7 +246,7 @@ IRP_ENDIF
 !    stop 'Unable to set ZMQ_RCVBUF on pull socket'
 !  endif
   
-  rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVHWM,1,4)
+  rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVHWM,2,4)
   if (rc /= 0) then
     stop 'Unable to set ZMQ_RCVHWM on pull socket'
   endif
@@ -323,7 +323,7 @@ IRP_ENDIF
     stop 'Unable to set ZMQ_LINGER on push socket'
   endif
   
-  rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDHWM,1,4)
+  rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDHWM,2,4)
   if (rc /= 0) then
     stop 'Unable to set ZMQ_SNDHWM on push socket'
   endif