Fix issue with lexer