diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml
index 606cafb8..bc772e93 100644
--- a/.github/workflows/nextion2text.yml
+++ b/.github/workflows/nextion2text.yml
@@ -19,6 +19,11 @@ jobs:
       with:
         ref: ${{ github.head_ref }}
 
+    - name: Get last commit message
+      id: last-commit-message
+      run: |
+        echo "::set-output name=msg::$(git log -1 --pretty=%s)"
+
     - name: Run nextion2text
       run: |
         cd HMI
@@ -27,5 +32,5 @@ jobs:
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
-        commit_message: Add nextion2text
+        commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text)
         file_pattern: HMI/n2t-out/*.txt
diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt
index df61c953..b0f5fe63 100644
--- a/HMI/n2t-out/cardEntities.txt
+++ b/HMI/n2t-out/cardEntities.txt
@@ -1563,7 +1563,7 @@ Timer tmSerial
                                         }else
                                         {
                                             //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
-                                            udelete u[2]+3
+                                            udelete payloadLength-1
                                             bufferPos=0
                                         }
                                         if(tId.txt=="popupLight")
diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt
index c19c3f5c..bb106e5f 100644
--- a/HMI/n2t-out/cardMedia.txt
+++ b/HMI/n2t-out/cardMedia.txt
@@ -469,7 +469,7 @@ Timer tmSerial
                                         }else
                                         {
                                             //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
-                                            udelete u[2]+3
+                                            udelete payloadLength-1
                                             bufferPos=0
                                         }
                                         if(tId.txt=="cardEntities")
diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt
index 52cfb87d..09a98fc8 100644
--- a/HMI/n2t-out/cardThermo.txt
+++ b/HMI/n2t-out/cardThermo.txt
@@ -493,7 +493,7 @@ Timer tmSerial
                                         }else
                                         {
                                             //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
-                                            udelete u[2]+3
+                                            udelete payloadLength-1
                                             bufferPos=0
                                         }
                                         if(tId.txt=="popupLight")
diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt
index 2f181354..00ff6f3f 100644
--- a/HMI/n2t-out/popupNotify.txt
+++ b/HMI/n2t-out/popupNotify.txt
@@ -303,7 +303,7 @@ Timer tmSerial
                                         }else
                                         {
                                             //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
-                                            udelete u[2]+3
+                                            udelete payloadLength-1
                                             bufferPos=0
                                         }
                                         if(tId.txt=="popupLight")