diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index c2e22982..f2639b05 100644
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -73,9 +73,9 @@ sona(void)
     if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
 	return RET_SYN;
     if (!radbuf)
-	radbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+	radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!visbuf)
-	visbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+	visbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad && radbuf) {
 	rad = malloc(WORLD_Y * sizeof(char *));
 	if (rad) {
diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c
index 305976cb..4f122697 100644
--- a/src/lib/subs/radmap.c
+++ b/src/lib/subs/radmap.c
@@ -91,9 +91,9 @@ radmap2(int owner,
     int changed = 0;
 
     if (!radbuf)
-	radbuf = malloc(WORLD_Y * (WORLD_X + 1));
+	radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!visbuf)
-	visbuf = malloc(WORLD_Y * (WORLD_X + 1));
+	visbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad) {
 	rad = malloc(WORLD_Y * sizeof(char *));
 	if (rad && radbuf) {
diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index 15113606..cf69c5f0 100644
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -73,7 +73,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
 	return;
 
     if (!radbuf)
-	radbuf = malloc(WORLD_Y * (WORLD_X + 1));
+	radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad) {
 	rad = malloc(WORLD_Y * sizeof(char *));
 	if (rad && radbuf) {