Lexer fix