diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp
index 2a2300366..889ef51e9 100644
--- a/source/duke3d/src/osdcmds.cpp
+++ b/source/duke3d/src/osdcmds.cpp
@@ -73,13 +73,13 @@ static int osdcmd_levelwarp(osdcmdptr_t parm)
 
 static int osdcmd_map(osdcmdptr_t parm)
 {
-	FString mapname;
 
     if (parm->numparms != 1)
     {
         return OSDCMD_SHOWHELP;
     }
-	
+    FString mapname = parm->parms[0];
+
     if (!fileSystem.Lookup(mapname, "MAP"))
     {
         OSD_Printf(OSD_ERROR "map: file \"%s\" not found.\n", mapname.GetChars());
diff --git a/source/exhumed/src/osdcmds.cpp b/source/exhumed/src/osdcmds.cpp
index 2f2506bb0..949335f03 100644
--- a/source/exhumed/src/osdcmds.cpp
+++ b/source/exhumed/src/osdcmds.cpp
@@ -63,13 +63,12 @@ static int osdcmd_noclip(osdcmdptr_t UNUSED(parm))
 
 static int osdcmd_map(osdcmdptr_t parm)
 {
-	FString mapname;
-
     if (parm->numparms != 1)
     {
         return OSDCMD_SHOWHELP;
     }
-	
+    FString mapname = parm->parms[0];
+
     if (!fileSystem.Lookup(mapname, "MAP"))
     {
         OSD_Printf(OSD_ERROR "map: file \"%s\" not found.\n", mapname.GetChars());
diff --git a/source/rr/src/osdcmds.cpp b/source/rr/src/osdcmds.cpp
index ed2606645..b5c7382c1 100644
--- a/source/rr/src/osdcmds.cpp
+++ b/source/rr/src/osdcmds.cpp
@@ -71,13 +71,12 @@ static int osdcmd_levelwarp(osdcmdptr_t parm)
 
 static int osdcmd_map(osdcmdptr_t parm)
 {
-	FString mapname;
-
     if (parm->numparms != 1)
     {
         return OSDCMD_SHOWHELP;
     }
-	
+    FString mapname = parm->parms[0];
+
     if (!fileSystem.Lookup(mapname, "MAP"))
     {
         OSD_Printf(OSD_ERROR "map: file \"%s\" not found.\n", mapname.GetChars());
diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp
index b8940a7a5..cda49d688 100644
--- a/source/sw/src/osdcmds.cpp
+++ b/source/sw/src/osdcmds.cpp
@@ -55,13 +55,12 @@ struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat = { -1, 0, 0 };
 
 static int osdcmd_map(osdcmdptr_t parm)
 {
-	FString mapname;
-
     if (parm->numparms != 1)
     {
         return OSDCMD_SHOWHELP;
     }
-	
+    FString mapname = parm->parms[0];
+
     if (!fileSystem.Lookup(mapname, "MAP"))
     {
         OSD_Printf(OSD_ERROR "map: file \"%s\" not found.\n", mapname.GetChars());