diff --git a/src/g_game.c b/src/g_game.c
index f54b3e981..4a8a03c33 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3382,7 +3382,7 @@ tryagain:
 
 void G_AddMapToBuffer(INT16 map)
 {
-	INT16 bufx, refreshnum = max(0, TOLMaps(G_TOLFlag(gametype))-3);
+	INT16 bufx, refreshnum = max(0, ((INT32)TOLMaps(G_TOLFlag(gametype)))-3);
 
 	// Add the map to the buffer.
 	for (bufx = NUMMAPS-1; bufx > 0; bufx--)