tried to fix more