removed m.index + in lexer