diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index ec0cc792..28b42f3b 100644
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -43,7 +43,7 @@
 int
 map(void)
 {
-    int unit_type = EF_SHIP;
+    int unit_type = EF_BAD;
     int bmap = 0;
     char *str;
     char buf[1024];
@@ -87,5 +87,8 @@ map(void)
     } else
 	str = player->argp[1];
 
+    if (unit_type == EF_BAD)
+	unit_type = EF_SHIP;
+
     return do_map(bmap, unit_type, str, player->argp[2]);
 }