fix more code