fix world creation flow