Fixed Cedric's race condition bug, perhaps.