Improve MMS null cursor patch