diff --git a/CanSpamDebugTransmitter.c b/CanSpamDebugTransmitter.c
index d453c9a..d0c27c1 100644
--- a/CanSpamDebugTransmitter.c
+++ b/CanSpamDebugTransmitter.c
@@ -369,16 +369,17 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
     if (env->time_dbg_Sen_Duct_CYC < env->timeMs) {
         env->time_dbg_Sen_Duct_CYC = env->timeMs + dbg_Sen_Duct_CYC;
 
+        if (env->dbg_Sen_Duct_MultMsg_Idx >= 3) {
+            env->dbg_Sen_Duct_MultMsg_Idx = 0;
+        } else {
+            ++env->dbg_Sen_Duct_MultMsg_Idx;
+        }
+
         ccu_candb_dbg_tx.dbg_Sen_Duct.dbg_Sen_Duct_MultMsg_Idx = env->dbg_Sen_Duct_MultMsg_Idx;
 
         env->can_id = Pack_dbg_Sen_Duct_candb_dbg2(&ccu_candb_dbg_tx.dbg_Sen_Duct, env->canFrame.data,
                                                    &env->canFrame.dlc, &env->ide);
 
-        ++env->dbg_Sen_Duct_MultMsg_Idx;
-        if (env->dbg_Sen_Duct_MultMsg_Idx > 3) {
-            env->dbg_Sen_Duct_MultMsg_Idx = 0;
-        }
-
         return event_dbg_Sen_Duct_CYC;
     }
 #endif
@@ -398,15 +399,17 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
     if (env->time_dbg_Sen_Incar_CYC < env->timeMs) {
         env->time_dbg_Sen_Incar_CYC = env->timeMs + dbg_Sen_Incar_CYC;
 
+        if (env->dbg_Sen_Incar_MultMsg_Idx >= 1) {
+            env->dbg_Sen_Incar_MultMsg_Idx = 0;
+        } else {
+            ++env->dbg_Sen_Incar_MultMsg_Idx;
+        }
+
         ccu_candb_dbg_tx.dbg_Sen_Incar.dbg_Sen_Incar_MultMsg_Idx = env->dbg_Sen_Incar_MultMsg_Idx;
 
         env->can_id = Pack_dbg_Sen_Incar_candb_dbg2(&ccu_candb_dbg_tx.dbg_Sen_Incar, env->canFrame.data,
                                                     &env->canFrame.dlc, &env->ide);
 
-        ++env->dbg_Sen_Incar_MultMsg_Idx;
-        if (env->dbg_Sen_Incar_MultMsg_Idx > 1) {
-            env->dbg_Sen_Incar_MultMsg_Idx = 0;
-        }
 
         return event_dbg_Sen_Incar_CYC;
     }