Even more race precautions

* It did not break yet, but I could not sleep without this commit.