Fix racing issue with fibers
Merge pull request #547 from Icenium/fatme/fix-racing-issue-with-fibers

Fix racing issue with fibers