bug, fix more