Add fix for M-SPC