Fix Lexer