diff --git a/smali/src/main/jflex/smaliLexer.jflex b/smali/src/main/jflex/smaliLexer.jflex
index bec71bee..b48df4f4 100644
--- a/smali/src/main/jflex/smaliLexer.jflex
+++ b/smali/src/main/jflex/smaliLexer.jflex
@@ -1,6 +1,7 @@
 package org.jf.smali;
 
 import java.io.*;
+import java.util.Stack;
 import org.antlr.runtime.*;
 import org.jf.smali.util.*;
 import org.jf.util.*;
@@ -38,6 +39,8 @@ import static org.jf.smali.smaliParser.*;
 
     private int apiLevel;
 
+    private Stack<Integer> stateStack = new Stack<>();
+
     public Token nextToken() {
         try {
             Token token = yylex();
@@ -137,6 +140,7 @@ import static org.jf.smali.smaliParser.*;
     }
 
     private void beginStateBasedToken(int state) {
+        stateStack.push(yystate());
         yybegin(state);
         sb.setLength(0);
         tokenStartLine = getLine();
@@ -146,12 +150,12 @@ import static org.jf.smali.smaliParser.*;
     }
 
     private Token endStateBasedToken(int type) {
-        yybegin(YYINITIAL);
-
         if (tokenError != null) {
             return invalidStateBasedToken(tokenError);
         }
 
+        yybegin(stateStack.pop());
+
         CommonToken token = new CommonToken(type, sb.toString());
         token.setStartIndex(tokenStartChar);
         token.setStopIndex(yychar + yylength() - 1);
@@ -167,7 +171,7 @@ import static org.jf.smali.smaliParser.*;
     }
 
     private Token invalidStateBasedToken(String message) {
-        yybegin(YYINITIAL);
+        yybegin(stateStack.pop());
 
         InvalidToken token = new InvalidToken(message, sb.toString());
         token.setStartIndex(tokenStartChar);
@@ -734,7 +738,6 @@ Type = {PrimitiveType} | {ClassDescriptor} | {ArrayPrefix} ({ClassDescriptor} |
     {ClassDescriptor} {
         yypushback(yylength());
         beginStateBasedToken(CLASS_DESCRIPTOR_BEGINNING);
-        sb.append(yytext());
     }
 
     // we have to drop into a separate state so that we don't parse something like
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
index 4f76d30a..f4260ea0 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
@@ -37,6 +37,7 @@ IIIII
 ZBSCIJFD
 ILa;[La;[I
 Ljava/lang/String;Ljava/lang/String;
+IIFFIILjava/lang/String;IIFFII
 [I[I[I
 [I[Z
 [I[Ljava/lang/String;
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
index 2ec07da3..52b62ad0 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
@@ -73,6 +73,20 @@ PRIMITIVE_TYPE("I")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+CLASS_DESCRIPTOR("Ljava/lang/String;")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+
 ARRAY_TYPE_PREFIX("[")
 PRIMITIVE_TYPE("I")
 ARRAY_TYPE_PREFIX("[")
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.smali b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.smali
index 4f76d30a..f4260ea0 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.smali
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.smali
@@ -37,6 +37,7 @@ IIIII
 ZBSCIJFD
 ILa;[La;[I
 Ljava/lang/String;Ljava/lang/String;
+IIFFIILjava/lang/String;IIFFII
 [I[I[I
 [I[Z
 [I[Ljava/lang/String;
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.tokens b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.tokens
index b2bf92e0..69c6dc38 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.tokens
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest_api29.tokens
@@ -73,6 +73,20 @@ PRIMITIVE_TYPE("I")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+CLASS_DESCRIPTOR("Ljava/lang/String;")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("F")
+PRIMITIVE_TYPE("I")
+PRIMITIVE_TYPE("I")
+
 ARRAY_TYPE_PREFIX("[")
 PRIMITIVE_TYPE("I")
 ARRAY_TYPE_PREFIX("[")