fix more InvalidHit