fix more npe