fix more / bug