bug fix more