[Mason] SPMO fix