fix more logic