Index fix in M-R