fix more ctxs