diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index dee59c079..ce361a40d 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -3330,9 +3330,9 @@ static int lib_gBuildMapName(lua_State *L)
 {
 	INT32 map = Lcheckmapnumber(L, 1, "G_BuildMapName");
 
-	if (lua_compatmode) // v1 has undefined behaviour if you return 0, who knew.
+	if (lua_compatmode && map == 0) // v1 has undefined behaviour if you return 0, who knew.
 	{
-		map = map == 0 ? G_RandMap(G_TOLFlag(gametype), gamemap-1, 0, 0, NULL) + 1 : map;
+		map = G_NativeMapToKart(G_RandMap(G_TOLFlag(gametype), gamemap-1, 0, 0, NULL) + 1);
 	}
 
 	//HUDSAFE