diff --git a/src/frontend/sras.sv b/src/frontend/sras.sv
index 1bd7ed8e0d233f396eb16ee29dd05d20a4fa17f5..accec65b3fcbc719295e17a0e01f9dc61b2bd832 100644
--- a/src/frontend/sras.sv
+++ b/src/frontend/sras.sv
@@ -60,16 +60,17 @@ module sras #(
             ovf_counter_d = '0;
         end else if (!bad_spec_i) begin
             if (push_i && !pop_i) begin
-                if (overflow) begin
+                if (overflow || prev_plus_one == '0 || pp_plus_one == '0) begin
                     ovf_counter_d[ptr_spec_d] = ovf_counter_q[ptr_spec_q] + 1'b1;
-                end else if (prev_plus_one == '0 || pp_plus_one == '0) begin
-                    ovf_counter_d[ptr_spec_d] = ovf_counter_q[ptr_spec_q] + 1'b1;
-                    if (begin_spec_i) begin
-                        ovf_counter_d[ptr_spec_q] = ovf_counter_q[ptr_spec_q] + 1'b1;
-                    end
                 end
-            end else if (!push_i && pop_i && ovf_counter_q[ptr_spec_q] != '0) begin
-                ovf_counter_d[ptr_spec_d] = ovf_counter_q[ptr_spec_q] - 1'b1;
+
+                if ((prev_plus_one == '0 || pp_plus_one == '0) && begin_spec_i) begin
+                    ovf_counter_d[ptr_spec_q] = ovf_counter_q[ptr_spec_q] + 1'b1;
+                end
+            end else if (!push_i && pop_i) begin
+                if (ovf_counter_q[ptr_spec_q] != '0) begin
+                    ovf_counter_d[ptr_spec_d] = ovf_counter_q[ptr_spec_q] - 1'b1;
+                end
             end else if (!bad_spec_i && begin_spec_i) begin
                 ovf_counter_d[ptr_spec_d] = ovf_counter_q[ptr_spec_q];
             end
@@ -82,14 +83,17 @@ module sras #(
         if (flush_i) begin
             tos_d = '0;
         end else if (!bad_spec_i) begin
-            if (push_i && !pop_i && !overflow && prev_plus_one != '0 && pp_plus_one != '0) begin
-                tos_d[ptr_spec_d] = prev_plus_one;
-
-                if (begin_spec_i) begin
-                    tos_d[ptr_spec_q] = pp_plus_one;
+            if (push_i && !pop_i) begin
+                if (!overflow && prev_plus_one != '0 && pp_plus_one != '0) begin
+                    tos_d[ptr_spec_d] = prev_plus_one;
+                    if (begin_spec_i) begin
+                        tos_d[ptr_spec_q] = pp_plus_one;
+                    end
+                end
+            end else if (!push_i && pop_i) begin
+                if (ovf_counter_q[ptr_spec_q] == '0) begin
+                    tos_d[ptr_spec_d] = prev_minus_one;
                 end
-            end else if (!push_i && pop_i && ovf_counter_q[ptr_spec_q] == '0) begin
-                tos_d[ptr_spec_d] = prev_minus_one;
             end else if (!bad_spec_i && begin_spec_i) begin
                 tos_d[ptr_spec_d] = tos_q[ptr_spec_q];
             end