fix more data bug