Fixed race condition with worlds