MO state machine fix