fix more changes