further fix for lexer