Lexer patch updated