fix more bug