Fix racing issue with fibers