ENH: still fixing spm_mcr