Fixed creation race condition bug