fix more issue