diff --git a/macro/MacroFlex.ll b/macro/MacroFlex.ll
index 9235cf3b..09c04da0 100644
--- a/macro/MacroFlex.ll
+++ b/macro/MacroFlex.ll
@@ -51,7 +51,8 @@ typedef Macro::parser::token token;
 %x FOR_BODY
 %x THEN_BODY
 %x ELSE_BODY
-%x END_DATE
+%x DATE_MATCH
+%x CLOSE_DATE
 
 %{
 // Increments location counter for every token read
@@ -92,8 +93,10 @@ DATE (-[1-9][0-9]*|[0-9]+)([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-
 <INITIAL>{DATE}             { yylloc->step(); *yyout << "dates('" << yytext << "')"; }
 <INITIAL>${DATE}            { yylloc->step(); *yyout << yytext + 1; }
 
-<INITIAL>dates{SPC}*\({SPC}*\'{DATE} { yylloc->step(); *yyout << yytext; BEGIN(END_DATE); }
-<END_DATE>{SPC}*\'{SPC}*\)           { yylloc->step(); *yyout << yytext; BEGIN(INITIAL); }
+<INITIAL>dates{SPC}*\({SPC}*       { yylloc->step(); *yyout << "dates("; BEGIN(DATE_MATCH); }
+<DATE_MATCH>\'{SPC}*{DATE}{SPC}*\' { yylloc->step(); *yyout << yytext; BEGIN(CLOSE_DATE); }
+<DATE_MATCH>{DATE}                 { yylloc->step(); *yyout << "'" << yytext << "'"; BEGIN(CLOSE_DATE); }
+<CLOSE_DATE>{SPC}*\)               { yylloc->step(); *yyout << ")"; BEGIN(INITIAL); }
 
 <EXPR>\}                    { BEGIN(INITIAL); return token::EOL; }