diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 3b54156cee6..37ff0c1042f 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -45,11 +45,6 @@ var/global/pipe_processing_killed = 0
 			del(master_controller)
 		master_controller = src
 
-	createRandomZlevel()			//probably shouldn't be here!
-
-	for(var/i=0, i<max_secret_rooms, i++)
-		make_mining_asteroid_secret()
-
 	if(!events)
 		new /datum/controller/event()
 
diff --git a/code/world.dm b/code/world.dm
index 0e61d58db15..6541bd372f5 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -79,6 +79,11 @@
 	slmaster.layer = FLY_LAYER
 	slmaster.mouse_opacity = 0
 
+	for(var/i=0, i<max_secret_rooms, i++)
+		make_mining_asteroid_secret()
+
+	createRandomZlevel()
+
 	master_controller = new /datum/controller/game_controller()
 	spawn(-1)
 		master_controller.setup()