diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 16c2a2307a3eb5f90ce26c354b9b032863a8b377..2e4873e3279cb57f0aca6ef7ab3ec5cdb180b587 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -61,7 +61,6 @@ public class Lexer
         int startPos = this.pos;
         int startLine = this.line;
 
-        int acceptState = -1;
         int acceptToken = -1;
         int acceptLength = -1;
         int acceptPos = -1;
@@ -162,7 +161,6 @@ public class Lexer
             {
                 if(acceptSub[dfaState] != -1)
                 {
-                    acceptState = dfaState;
                     acceptToken = acceptSub[dfaState];
                     acceptLength = this.text.length();
                     acceptPos = this.pos;
@@ -172,7 +170,7 @@ public class Lexer
             }
             else
             {
-                if(acceptState != -1)
+                if(acceptToken != -1)
                 {
                     Token tok;
                     switch(acceptToken)
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index 3d482aa2128f095867d0b63b84017978f2a00376..4e552fa254acee1eb97732fd5212a15501dcea7a 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -85,7 +85,6 @@ public class Lexer
         int startPos = this.pos;
         int startLine = this.line;
 
-        int acceptState = -1;
         int acceptToken = -1;
         int acceptLength = -1;
         int acceptPos = -1;
@@ -186,7 +185,6 @@ public class Lexer
             {
                 if(acceptSub[dfaState] != -1)
                 {
-                    acceptState = dfaState;
                     acceptToken = acceptSub[dfaState];
                     acceptLength = this.text.length();
                     acceptPos = this.pos;
@@ -196,7 +194,7 @@ public class Lexer
             }
             else
             {
-                if(acceptState != -1)
+                if(acceptToken != -1)
                 {
                     Token tok;
                     switch(acceptToken)