diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index b7dd9770abcf8828329c597ba4247e1d5b5929d2..74527313dafd095a6179fb6ac31ea476c02d7daa 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -96,8 +96,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>["/"]["/"].*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>%.*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>\/{2}.*
 <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 5913fe89beca29c2d21942ab5cbf6bfc0022485e..d4d31939f62052a136f770c387ea09373ce5ddca 100644
--- a/src/macro/MacroFlex.ll
+++ b/src/macro/MacroFlex.ll
@@ -71,7 +71,8 @@ CONT \\\\
   yylloc->step();
 %}
 
-<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>["/"]["/"].*
+ // Ignore inline comments
+<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>\/{2}.*
 
 <INITIAL>^{SPC}*@#{SPC}*includepath{SPC}+\"([^\"\r\n:;|<>]*){1}(:[^\"\r\n:;|<>]*)*\"{SPC}*{EOL} {
                               yylloc->lines(1);