Fix race condition between Value/Phase1 messages