diff --git a/src/pus/stack.rs b/src/pus/stack.rs
index eb1fb3f..58a5cd6 100644
--- a/src/pus/stack.rs
+++ b/src/pus/stack.rs
@@ -33,10 +33,11 @@ impl PusStack {
         loop {
             let mut nothing_to_do = true;
             let mut is_srv_finished =
-                |tc_handling_done: HandlingStatus, reply_handling_done: Option<HandlingStatus>| {
-                    if tc_handling_done == HandlingStatus::Empty
-                        || (reply_handling_done.is_some()
-                            && reply_handling_done.unwrap() == HandlingStatus::Empty)
+                |tc_handling_status: HandlingStatus,
+                 reply_handling_status: Option<HandlingStatus>| {
+                    if tc_handling_status == HandlingStatus::HandledOne
+                        || (reply_handling_status.is_some()
+                            && reply_handling_status.unwrap() == HandlingStatus::HandledOne)
                     {
                         nothing_to_do = false;
                     }
@@ -61,7 +62,7 @@ impl PusStack {
             // );
             if nothing_to_do {
                 // Timeout checking is only done once.
-                // self.action_srv_wrapper.check_for_request_timeouts();
+                self.action_srv_wrapper.check_for_request_timeouts();
                 // self.hk_srv_wrapper.check_for_request_timeouts();
                 // self.mode_srv.check_for_request_timeouts();
                 break;