diff --git a/Loretta.Tests/Lexing/Modules/IdentifierLexerModuleTests.cs b/Loretta.Tests/Lexing/Modules/IdentifierLexerModuleTests.cs
index bc28571b..75b59e46 100644
--- a/Loretta.Tests/Lexing/Modules/IdentifierLexerModuleTests.cs
+++ b/Loretta.Tests/Lexing/Modules/IdentifierLexerModuleTests.cs
@@ -11,58 +11,80 @@ namespace Loretta.Tests.Lexing.Modules
     [TestClass]
     public class IdentifierLexerModuleTests
     {
-        private readonly IdentifierLexerModule lexerModule;
-
-        public IdentifierLexerModuleTests ( )
+        private static IdentifierLexerModule GetLexerModule ( Boolean useLuaJitIdentifierRules )
         {
-            this.lexerModule = new IdentifierLexerModule ( LuaOptions.All, new[]
-            {
+            var identifierLexerModule = new IdentifierLexerModule ( useLuaJitIdentifierRules ? LuaOptions.LuaJIT : LuaOptions.Lua51, new[]
+                        {
                 "do",
                 "end"
             }, new[]
-            {
+                        {
                 "and",
                 "or"
             } );
+            identifierLexerModule.AddLiteral ( "nil", LuaTokenType.Nil, null );
+            identifierLexerModule.AddLiteral ( "true", LuaTokenType.Boolean, true );
+            identifierLexerModule.AddLiteral ( "false", LuaTokenType.Boolean, false );
+            return identifierLexerModule;
         }
 
+        private static readonly IdentifierLexerModule moduleWithoutLuajitRules = GetLexerModule ( false );
+        private static readonly IdentifierLexerModule moduleWithLuajitRules = GetLexerModule ( true );
+
         [DataTestMethod]
-        [DataRow ( false, "123" )]
-        [DataRow ( false, " " )]
-        [DataRow ( false, "[" )]
-        [DataRow ( false, "]" )]
-        [DataRow ( true, "_" )]
-        [DataRow ( true, "🅱" )]
-        [DataRow ( true, "\ufeff" /* ZERO WIDTH NO-BREAK SPACE */ )]
-        [DataRow ( true, "\u206b" /* ACTIVATE SYMMETRIC SWAPPING */ )]
-        [DataRow ( true, "\u202a" /* LEFT-TO-RIGHT EMBEDDING */ )]
-        [DataRow ( true, "\u206a" /* INHIBIT SYMMETRIC SWAPPING */ )]
-        [DataRow ( true, "\ufeff" /* ZERO WIDTH NO-BREAK SPACE */ )]
-        [DataRow ( true, "\u206a" /* INHIBIT SYMMETRIC SWAPPING */ )]
-        [DataRow ( true, "\u200e" /* LEFT-TO-RIGHT MARK */ )]
-        [DataRow ( true, "\u200c" /* ZERO WIDTH NON-JOINER */ )]
-        [DataRow ( true, "\u200e" /* LEFT-TO-RIGHT MARK */ )]
-        public void CanConsumeWorks ( Boolean expected, String str ) =>
-            Assert.AreEqual ( expected, this.lexerModule.CanConsumeNext ( new StringCodeReader ( str ) ) );
+        [DataRow ( true, false, "123" )]
+        [DataRow ( true, false, " " )]
+        [DataRow ( true, false, "[" )]
+        [DataRow ( true, false, "]" )]
+        [DataRow ( true, true, "_" )]
+        [DataRow ( false, true, "🅱" )]
+        [DataRow ( false, true, "\ufeff" /* ZERO WIDTH NO-BREAK SPACE */ )]
+        [DataRow ( false, true, "\u206b" /* ACTIVATE SYMMETRIC SWAPPING */ )]
+        [DataRow ( false, true, "\u202a" /* LEFT-TO-RIGHT EMBEDDING */ )]
+        [DataRow ( false, true, "\u206a" /* INHIBIT SYMMETRIC SWAPPING */ )]
+        [DataRow ( false, true, "\ufeff" /* ZERO WIDTH NO-BREAK SPACE */ )]
+        [DataRow ( false, true, "\u206a" /* INHIBIT SYMMETRIC SWAPPING */ )]
+        [DataRow ( false, true, "\u200e" /* LEFT-TO-RIGHT MARK */ )]
+        [DataRow ( false, true, "\u200c" /* ZERO WIDTH NON-JOINER */ )]
+        [DataRow ( false, true, "\u200e" /* LEFT-TO-RIGHT MARK */ )]
+        public void CanConsumeWorks ( Boolean shouldWorkWithoutLuajitIdentifierRules, Boolean expected, String str )
+        {
+            Assert.AreEqual ( expected, moduleWithLuajitRules.CanConsumeNext ( new StringCodeReader ( str ) ) );
+            if ( shouldWorkWithoutLuajitIdentifierRules )
+                Assert.AreEqual ( expected, moduleWithoutLuajitRules.CanConsumeNext ( new StringCodeReader ( str ) ) );
+        }
 
         [DataTestMethod]
-        [DataRow ( LuaTokenType.Keyword, "do", "do", "do return end" )]
-        [DataRow ( LuaTokenType.Keyword, "end", "end", "end" )]
-        [DataRow ( LuaTokenType.Operator, "and", "and", "and true" )]
-        [DataRow ( LuaTokenType.Identifier, "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e", "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e", "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e = _G" )]
-        [DataRow ( LuaTokenType.Identifier, "_G", "_G", "_G = nil" )]
-        [DataRow ( LuaTokenType.Nil, "nil", null, "nil" )]
-        [DataRow ( LuaTokenType.Boolean, "true", true, "true and false" )]
-        [DataRow ( LuaTokenType.Boolean, "false", false, "false and true" )]
-        public void ConsumeNextWorks ( LuaTokenType expectedType, String expectedRaw, Object expectedValue, String input )
+        [DataRow ( true, LuaTokenType.Keyword, "do", "do", "do return end" )]
+        [DataRow ( true, LuaTokenType.Keyword, "end", "end", "end" )]
+        [DataRow ( true, LuaTokenType.Operator, "and", "and", "and true" )]
+        [DataRow ( false, LuaTokenType.Identifier, "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e", "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e", "\ufeff\u206b\u202a\u206a\ufeff\u206a\u200e\u200c\u200e = _G" )]
+        [DataRow ( true, LuaTokenType.Identifier, "_G", "_G", "_G = nil" )]
+        [DataRow ( true, LuaTokenType.Identifier, "test0", "test0", "test0 = 1" )]
+        [DataRow ( true, LuaTokenType.Identifier, "te0st", "te0st", "te0st = 1" )]
+        [DataRow ( true, LuaTokenType.Nil, "nil", null, "nil" )]
+        [DataRow ( true, LuaTokenType.Boolean, "true", true, "true and false" )]
+        [DataRow ( true, LuaTokenType.Boolean, "false", false, "false and true" )]
+        public void ConsumeNextWorks ( Boolean shouldWorkWithoutLuajitIdentifierRules, LuaTokenType expectedType, String expectedRaw, Object expectedValue, String input )
         {
             var diagnostics = new DiagnosticList ( );
-            Token<LuaTokenType> token = this.lexerModule.ConsumeNext ( new StringCodeReader ( input ), diagnostics );
+            Token<LuaTokenType> token = moduleWithLuajitRules.ConsumeNext ( new StringCodeReader ( input ), diagnostics );
 
             TestUtils.AssertDiagnosticsEmpty ( diagnostics, input );
             Assert.AreEqual ( expectedType, token.Type );
             Assert.AreEqual ( expectedRaw, token.Raw );
             Assert.AreEqual ( expectedValue, token.Value );
+
+            if ( shouldWorkWithoutLuajitIdentifierRules )
+            {
+                diagnostics = new DiagnosticList ( );
+                token = moduleWithoutLuajitRules.ConsumeNext ( new StringCodeReader ( input ), diagnostics );
+
+                TestUtils.AssertDiagnosticsEmpty ( diagnostics, input );
+                Assert.AreEqual ( expectedType, token.Type );
+                Assert.AreEqual ( expectedRaw, token.Raw );
+                Assert.AreEqual ( expectedValue, token.Value );
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Loretta/Lexing/Modules/IdentifierLexerModule.cs b/Loretta/Lexing/Modules/IdentifierLexerModule.cs
index e437f8e7..c98144f0 100644
--- a/Loretta/Lexing/Modules/IdentifierLexerModule.cs
+++ b/Loretta/Lexing/Modules/IdentifierLexerModule.cs
@@ -127,7 +127,7 @@ public Token<LuaTokenType> ConsumeNext ( ICodeReader reader, IProgress<Diagnosti
             SourceLocation start = reader.Location;
             var identifier = this.LuaOptions.UseLuaJitIdentifierRules
                 ? reader.ReadStringWhile ( ch => CharUtils.IsValidTrailingIdentifierChar ( true, ch ) )
-                : reader.ReadStringWhile ( ch => CharUtils.IsValidFirstIdentifierChar ( false, ch ) );
+                : reader.ReadStringWhile ( ch => CharUtils.IsValidTrailingIdentifierChar ( false, ch ) );
             SourceRange range = start.To ( reader.Location );
 
             if ( this.Keywords.Contains ( identifier ) )