diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index af0c8590..f534549b 100644
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -137,13 +137,13 @@ map(void)
 	    where = 2;
 	    break;
 	case 't':
-	    if (!bmap)
+	    if (bmap != EF_BMAP)
 		goto bad_flag;
 	    bmap = EF_MAP;
 	    *(b + 1) = 0;
 	    break;
 	case 'r':
-	    if (!bmap)
+	    if (bmap != EF_BMAP)
 		goto bad_flag;
 	    bmap = EF_MAP + EF_BMAP;
 	    *(b + 1) = 0;