fix more codes