fixed lexer so that it catches join