diff --git a/src/async/core/AsyncStateMachine.h b/src/async/core/AsyncStateMachine.h
index 9ec55dfb..1f25be28 100644
--- a/src/async/core/AsyncStateMachine.h
+++ b/src/async/core/AsyncStateMachine.h
@@ -171,15 +171,15 @@ class StateMachine
           [&](Timer*)
           {
             assert(m_state != nullptr);
-            static_cast<StateTopBaseT*>(m_state)->timeoutEvent();
             clearTimeout();
+            static_cast<StateTopBaseT*>(m_state)->timeoutEvent();
           });
       m_at_timer.expired.connect(
           [&](AtTimer*)
           {
             assert(m_state != nullptr);
-            static_cast<StateTopBaseT*>(m_state)->timeoutAtEvent();
             clearTimeoutAt();
+            static_cast<StateTopBaseT*>(m_state)->timeoutAtEvent();
           });
     }
 
@@ -299,6 +299,10 @@ class StateMachine
      */
     void setTimeout(int timeout_ms)
     {
+#ifdef ASYNC_STATE_MACHINE_DEBUG
+      std::cout << "### StateMachine: setTimeout(" << timeout_ms << ")"
+                << std::endl;
+#endif
       m_timer.setTimeout(timeout_ms);
       m_timer.setEnable(true);
     }
@@ -327,6 +331,9 @@ class StateMachine
      */
     void clearTimeout(void)
     {
+#ifdef ASYNC_STATE_MACHINE_DEBUG
+      std::cout << "### StateMachine: clearTimeout()" << std::endl;
+#endif
       m_timer.setEnable(false);
     }
 
diff --git a/src/versions b/src/versions
index 8a71bb83..8b1c6b65 100644
--- a/src/versions
+++ b/src/versions
@@ -8,10 +8,10 @@ QTEL=1.2.4.99.5
 LIBECHOLIB=1.3.3.99.2
 
 # Version for the Async library
-LIBASYNC=1.6.99.22
+LIBASYNC=1.6.99.23
 
 # SvxLink versions
-SVXLINK=1.7.99.70
+SVXLINK=1.7.99.71
 MODULE_HELP=1.0.0
 MODULE_PARROT=1.1.1
 MODULE_ECHO_LINK=1.5.99.3