diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index e16c25da..b9e6c84a 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -1999,6 +1999,7 @@ void Game::updatestate()
             state++;
             statedelay = 15;
             break;
+#if !defined(NO_CUSTOM_LEVELS)
         case 1011:
             //Found a crewmate!
             advancetext = true;
@@ -2010,17 +2011,17 @@ void Game::updatestate()
                 graphics.addline("You have found a lost crewmate!");
                 graphics.textboxcenterx();
 
-                if(int(map.customcrewmates-crewmates())==0)
+                if(int(ed.numcrewmates-crewmates())==0)
                 {
                     graphics.createtextbox("     All crewmates rescued!    ", 50, 65, 174, 174, 174);
                 }
-                else if(map.customcrewmates-crewmates()==1)
+                else if(ed.numcrewmates-crewmates()==1)
                 {
-                    graphics.createtextbox("    " + help.number(int(map.customcrewmates-crewmates()))+ " remains    ", 50, 65, 174, 174, 174);
+                    graphics.createtextbox("    " + help.number(int(ed.numcrewmates-crewmates()))+ " remains    ", 50, 65, 174, 174, 174);
                 }
                 else
                 {
-                    graphics.createtextbox("     " + help.number(int(map.customcrewmates-crewmates()))+ " remain    ", 50, 65, 174, 174, 174);
+                    graphics.createtextbox("     " + help.number(int(ed.numcrewmates-crewmates()))+ " remain    ", 50, 65, 174, 174, 174);
                 }
                 graphics.textboxcenterx();
 
@@ -2032,22 +2033,21 @@ void Game::updatestate()
                 graphics.addline("You have found a lost crewmate!");
                 graphics.textboxcenterx();
 
-                if(int(map.customcrewmates-crewmates())==0)
+                if(int(ed.numcrewmates-crewmates())==0)
                 {
                     graphics.createtextbox("     All crewmates rescued!    ", 50, 135, 174, 174, 174);
                 }
-                else if(map.customcrewmates-crewmates()==1)
+                else if(ed.numcrewmates-crewmates()==1)
                 {
-                    graphics.createtextbox("    " + help.number(int(map.customcrewmates-crewmates()))+ " remains    ", 50, 135, 174, 174, 174);
+                    graphics.createtextbox("    " + help.number(int(ed.numcrewmates-crewmates()))+ " remains    ", 50, 135, 174, 174, 174);
                 }
                 else
                 {
-                    graphics.createtextbox("     " + help.number(int(map.customcrewmates-crewmates()))+ " remain    ", 50, 135, 174, 174, 174);
+                    graphics.createtextbox("     " + help.number(int(ed.numcrewmates-crewmates()))+ " remain    ", 50, 135, 174, 174, 174);
                 }
                 graphics.textboxcenterx();
             }
             break;
-#if !defined(NO_CUSTOM_LEVELS)
         case 1013:
             graphics.textboxremove();
             hascontrol = true;
@@ -2055,7 +2055,7 @@ void Game::updatestate()
             completestop = false;
             state = 0;
 
-            if(map.customcrewmates-crewmates()==0)
+            if(ed.numcrewmates-crewmates()==0)
             {
                 if(map.custommodeforreal)
                 {
@@ -2090,10 +2090,10 @@ void Game::updatestate()
             music.play(6);
             graphics.backgrounddrawn = true;
             map.tdrawback = true;
-            //Update level stats
-            if(map.customcrewmates-crewmates()==0)
-            {
 #if !defined(NO_CUSTOM_LEVELS)
+            //Update level stats
+            if(ed.numcrewmates-crewmates()==0)
+            {
                 //Finished level
                 if(ed.numtrinkets-trinkets()==0)
                 {
@@ -2101,11 +2101,11 @@ void Game::updatestate()
                     updatecustomlevelstats(customlevelfilename, 3);
                 }
                 else
-#endif
                 {
                     updatecustomlevelstats(customlevelfilename, 1);
                 }
             }
+#endif
             createmenu("levellist");
             state = 0;
             break;
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 3fe0aab8..3ccd70d6 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -1731,8 +1731,6 @@ void mapclass::loadlevel(int rx, int ry)
 			}
 			}
 
-		customcrewmates=ed.numcrewmates;
-
 		//do the appear/remove roomname here
 		break;
 #endif
diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h
index 2d0bc658..079abd3c 100644
--- a/desktop_version/src/Map.h
+++ b/desktop_version/src/Map.h
@@ -134,7 +134,6 @@ public:
     bool custommodeforreal;
     int customx, customy;
     int customwidth, customheight;
-    int customcrewmates;
     int custommmxoff, custommmyoff, custommmxsize, custommmysize;
     int customzoom;
     bool customshowmm;
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 056b9272..e7af4dad 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -2138,10 +2138,10 @@ void maprender()
                 graphics.Print( -1, 220-110, ed.ListOfMetaData[game.playcustomlevel].Desc2, 196, 196, 255 - help.glow, true);
                 graphics.Print( -1, 220-120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
 
-                if(map.customcrewmates-game.crewmates()==1){
-                    graphics.Print(1,220-165, help.number(int(map.customcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true);
-                }else if(map.customcrewmates-game.crewmates()>0){
-                    graphics.Print(1,220-165, help.number(int(map.customcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true);
+                if(ed.numcrewmates-game.crewmates()==1){
+                    graphics.Print(1,220-165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true);
+                }else if(ed.numcrewmates-game.crewmates()>0){
+                    graphics.Print(1,220-165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true);
                 }
             }
             else
@@ -2153,10 +2153,10 @@ void maprender()
                 graphics.Print( -1, 110, ed.ListOfMetaData[game.playcustomlevel].Desc2, 196, 196, 255 - help.glow, true);
                 graphics.Print( -1, 120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
 
-                if(map.customcrewmates-game.crewmates()==1){
-                    graphics.Print(1,165, help.number(int(map.customcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true);
-                }else if(map.customcrewmates-game.crewmates()>0){
-                    graphics.Print(1,165, help.number(int(map.customcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true);
+                if(ed.numcrewmates-game.crewmates()==1){
+                    graphics.Print(1,165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true);
+                }else if(ed.numcrewmates-game.crewmates()>0){
+                    graphics.Print(1,165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true);
                 }
             }
         }