Take two on the async race condition