little modification on lexer