diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 6245c925..0779015a 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -265,8 +265,9 @@ void Vt102Emulation::addArgument()
 
 void Vt102Emulation::addToCurrentToken(uint cc)
 {
+    tokenBufferPos = qMin(tokenBufferPos, MAX_TOKEN_LENGTH - 1);
     tokenBuffer[tokenBufferPos] = cc;
-    tokenBufferPos = qMin(tokenBufferPos + 1, MAX_TOKEN_LENGTH - 1);
+    tokenBufferPos++;
 }
 
 // Character Class flags used while decoding