diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index c0a10f37df1f8a1338c2ba288eaa51337b8268bd..7c2bce41e62ea408dd3b5a9f14a6a202fcb98eac 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -97,8 +97,8 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2
 <INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,COMMENT,DATES_STATEMENT,LINE1,LINE2,LINE3>[\n]+       { yylloc->step(); }
 
  /* Comments */
-<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>%.*
-<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>\/{2}.*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>["%"].*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>["/"]["/"].*
 <INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>"/*"   {comment_caller = YY_START; BEGIN COMMENT;}
 
 <COMMENT>"*/"        {BEGIN comment_caller;}
diff --git a/src/macro/MacroFlex.ll b/src/macro/MacroFlex.ll
index 92af81baf88b4308223c1fbce7d3cf89be95d594..e2330afa0d056c73363bbda6a3f15f8d9e749b32 100644
--- a/src/macro/MacroFlex.ll
+++ b/src/macro/MacroFlex.ll
@@ -73,8 +73,7 @@ CONT \\\\
   yylloc->step();
 %}
 
- // Ignore inline comments
-<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>\/{2}.*
+<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>["/"]["/"].*
 
 <INITIAL>^{SPC}*@#{SPC}*includepath{SPC}+\"([^\"\r\n:;|<>]*){1}(:[^\"\r\n:;|<>]*)*\"{SPC}*{EOL} {
                               yylloc->lines(1);