fix more race conditions