Trying to fix lexer