diff --git a/hw/verilator_model/src/NICInbound.hpp b/hw/verilator_model/src/NICInbound.hpp
index 95f12fb..05183d3 100644
--- a/hw/verilator_model/src/NICInbound.hpp
+++ b/hw/verilator_model/src/NICInbound.hpp
@@ -386,14 +386,14 @@ namespace PsPIN
         // Progress HERs
         void her_progress_posedge()
         {
-            if (her_cmd_wait)
-            {
+	    *ni_ctrl.her_valid_o = 0;
+
+	    if (!(*ni_ctrl.her_ready_i))
+	    {
                 ni_ctrl_stalls++;
                 return;
             }
 
-            *ni_ctrl.her_valid_o = 0;
-
             if (ready_hers.empty())
             {
                 return;
@@ -454,11 +454,7 @@ namespace PsPIN
 
         void her_progress_negedge()
         {
-            her_cmd_wait = false;
-            if (*ni_ctrl.her_valid_o && !(*ni_ctrl.her_ready_i))
-            {
-                her_cmd_wait = true;
-            }
+	    /* Nothing to do here yet */
         }
 
         // Get feedback