Lexer fixed