Fixing a race condition with that last commit