diff --git a/grammar/Lua51.jj b/grammar/Lua51.jj
index 5268857f..f0f60440 100644
--- a/grammar/Lua51.jj
+++ b/grammar/Lua51.jj
@@ -65,7 +65,7 @@ MORE :
 
 <IN_COMMENT> SPECIAL_TOKEN :
 {
-  <COMMENT: "\n" | "\r" | "\r\n" | "" > : DEFAULT
+  <COMMENT: (~["\n","\r"])* ("\n"|"\r"|"\r\n")? > : DEFAULT
 }
 
 <IN_LC0> SPECIAL_TOKEN : { <LONGCOMMENT0: "]]" > : DEFAULT }
@@ -80,7 +80,7 @@ MORE :
 <IN_LS3> TOKEN : { <LONGSTRING3: "]===]" > : DEFAULT }
 <IN_LSN> TOKEN : { <LONGSTRINGN: "]====" ("=")* "]" > : DEFAULT }
 
-<IN_COMMENT,IN_LC0,IN_LC1,IN_LC2,IN_LC3,IN_LCN,IN_LS0,IN_LS1,IN_LS2,IN_LS3,IN_LSN> MORE :
+<IN_LC0,IN_LC1,IN_LC2,IN_LC3,IN_LCN,IN_LS0,IN_LS1,IN_LS2,IN_LS3,IN_LSN> MORE :
 {
   < ~[] >
 }