Attempt to fix a race condition when creating Bucket objects.