fix more bypass related bugs