fix more cases