diff --git a/src/SAMPLING/dmc_step.irp.f b/src/SAMPLING/dmc_step.irp.f
index 2764609..7044080 100644
--- a/src/SAMPLING/dmc_step.irp.f
+++ b/src/SAMPLING/dmc_step.irp.f
@@ -248,14 +248,15 @@ END_SHELL
   if (cpu1 < cpu0) then
     cpu1 = cpu1+cpu0
   endif
-  loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
+  loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
   if (cpu1-cpu2 > count_rate) then
     integer                        :: do_run
     call get_running(do_run)
-    loop = do_run == t_Running
+    loop = loop.and.(do_run == t_Running)
     cpu2 = cpu1
   endif
 
+
   SOFT_TOUCH elec_coord_full_dmc psi_value psi_grad_psi_inv_x psi_grad_psi_inv_y psi_grad_psi_inv_z elec_coord 
 
  enddo
diff --git a/src/SAMPLING/fkmc_step.irp.f b/src/SAMPLING/fkmc_step.irp.f
index 878af69..3f57d20 100644
--- a/src/SAMPLING/fkmc_step.irp.f
+++ b/src/SAMPLING/fkmc_step.irp.f
@@ -319,11 +319,11 @@ END_SHELL
   if (cpu1 < cpu0) then
     cpu1 = cpu1+cpu0
   endif
-  loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
+  loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
   if (cpu1-cpu2 > count_rate) then
     integer                        :: do_run
     call get_running(do_run)
-    loop = do_run == t_Running
+    loop = loop.and.(do_run == t_Running)
     cpu2 = cpu1
   endif
 
diff --git a/src/SAMPLING/pdmc_step.irp.f b/src/SAMPLING/pdmc_step.irp.f
index 9c9b4a8..e4c3e70 100644
--- a/src/SAMPLING/pdmc_step.irp.f
+++ b/src/SAMPLING/pdmc_step.irp.f
@@ -280,11 +280,11 @@ END_SHELL
   if (cpu1 < cpu0) then
     cpu1 = cpu1+cpu0
   endif
-  loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
+  loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
   if (cpu1-cpu2 > count_rate) then
     integer                        :: do_run
     call get_running(do_run)
-    loop = do_run == t_Running
+    loop = loop.and.(do_run == t_Running)
     cpu2 = cpu1
   endif
 
diff --git a/src/SAMPLING/srmc_step.irp.f b/src/SAMPLING/srmc_step.irp.f
index 295d2ad..b34692f 100644
--- a/src/SAMPLING/srmc_step.irp.f
+++ b/src/SAMPLING/srmc_step.irp.f
@@ -320,11 +320,11 @@ END_SHELL
   if (cpu1 < cpu0) then
     cpu1 = cpu1+cpu0
   endif
-  loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
+  loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
   if (cpu1-cpu2 > count_rate) then
     integer                        :: do_run
     call get_running(do_run)
-    loop = do_run == t_Running
+    loop = loop.and.(do_run == t_Running)
     cpu2 = cpu1
   endif
 
diff --git a/src/SAMPLING/vmc_step.irp.f b/src/SAMPLING/vmc_step.irp.f
index 7aedf42..e09ee80 100644
--- a/src/SAMPLING/vmc_step.irp.f
+++ b/src/SAMPLING/vmc_step.irp.f
@@ -132,11 +132,11 @@ END_SHELL
       if (cpu1 < cpu0) then
         cpu1 = cpu1+cpu0
       endif
-      loop = dble(cpu1-cpu0)*dble(walk_num) < dble(block_time)*dble(count_rate)
+      loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
       if (cpu1-cpu2 > count_rate) then
         integer                        :: do_run
         call get_running(do_run)
-        loop = do_run == t_Running
+        loop = loop.and.(do_run == t_Running)
         cpu2 = cpu1
       endif