Lexer issue fixed