diff --git a/src/main/jastadd/scanner/Keywords.flex b/src/main/jastadd/scanner/Keywords.flex
index 76397b9efcd1c748a3a1eb69675d23dbd4042178..27524e3d2ee6768c8ec6117059967c5780be15ce 100644
--- a/src/main/jastadd/scanner/Keywords.flex
+++ b/src/main/jastadd/scanner/Keywords.flex
@@ -1,4 +1,4 @@
-<YYINITIAL,DECLARATION> {
+<YYINITIAL,COMMENT,DECLARATION> {
   "abstract"            { yybegin(DECLARATION); return sym(Terminals.ABSTRACT); }
   "rel"                 { yybegin(DECLARATION); return sym(Terminals.RELATION); }
 }
diff --git a/src/main/jastadd/scanner/RulesPostamble.flex b/src/main/jastadd/scanner/RulesPostamble.flex
index 5460a0b87e2002c06430aa5cc88abf0b39f30b9f..37f546ff66770d94feaa71ff8b74bd4462f190d8 100644
--- a/src/main/jastadd/scanner/RulesPostamble.flex
+++ b/src/main/jastadd/scanner/RulesPostamble.flex
@@ -1,7 +1,7 @@
-<YYINITIAL,DECLARATION> {
+<YYINITIAL,COMMENT,DECLARATION> {
   {ID}                  { yybegin(DECLARATION); return sym(Terminals.ID); }
-  [^]                   { throw new ScannerError((yyline+1) +"," + (yycolumn+1) + ": Illegal character <"+yytext()+">"); }
 }
-<YYINITIAL,DECLARATION,COMMENT> {
+<YYINITIAL,COMMENT,DECLARATION> {
   <<EOF>>               { return sym(Terminals.EOF); }
-}
+  [^]                   { throw new ScannerError((yyline+1) +"," + (yycolumn+1) + ": Illegal character <"+yytext()+">"); }
+}
\ No newline at end of file
diff --git a/src/main/jastadd/scanner/Symbols.flex b/src/main/jastadd/scanner/Symbols.flex
index 7f05c115b570fd3681617106bb77bc25bb79d7b2..5ac1c2d1855c91514b2d18483896ae0bb5ba1d08 100644
--- a/src/main/jastadd/scanner/Symbols.flex
+++ b/src/main/jastadd/scanner/Symbols.flex
@@ -1,4 +1,4 @@
-<YYINITIAL,DECLARATION> {
+<YYINITIAL,COMMENT,DECLARATION> {
   ";"                   { yybegin(COMMENT);     return sym(Terminals.SCOL); }
   ":"                   { yybegin(DECLARATION); return sym(Terminals.COL); }
   "::="                 { yybegin(DECLARATION); return sym(Terminals.ASSIGN); }