diff --git a/src/g_game.c b/src/g_game.c
index 36a3c9426..d2d8ee7b1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3166,9 +3166,9 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer)
 	else
 	{
 		ix = okmaps[P_RandomKey(numokmaps)];
-		/*for (bufx = NUMMAPS-4; bufx > 0; bufx--)
+		for (bufx = NUMMAPS-4; bufx > 0; bufx--)
 			randmapbuffer[bufx] = randmapbuffer[bufx-1];
-		randmapbuffer[0] = ix;*/
+		randmapbuffer[0] = ix;
 	}
 
 	Z_Free(okmaps);
@@ -3296,7 +3296,7 @@ static void G_DoCompleted(void)
 
 	automapactive = false;
 
-	if (randmapbuffer[TOLMaps(G_TOLFlag(gametype))-4)] != -1) // filled up, so lets clear it
+	if (randmapbuffer[TOLMaps(G_TOLFlag(gametype))-4] != -1) // filled up, so lets clear it
 	{
 		for (i = 0; i < NUMMAPS-4; i++)
 			randmapbuffer[i] = -1;