fix more desync and modify raw mutton behavior once more