fix to lexer
merge