fix more routing