--- a/src/openttd.cpp	Fri Feb 08 17:53:01 2008 +0000
+++ b/src/openttd.cpp	Fri Feb 08 19:57:56 2008 +0000
@@ -1442,8 +1442,11 @@
 	 * if a player does exist, rather then checking name_1 */
 	if (CheckSavegameVersionOldStyle(4, 1)) CheckIsPlayerActive();
 
-	/* the void tiles on the southern border used to belong to a wrong class (pre 4.3). */
-	if (CheckSavegameVersionOldStyle(4, 3)) UpdateVoidTiles();
+	/* The void tiles on the southern border used to belong to a wrong class (pre 4.3).
+	 * This problem appears in savegame version 21 too, see r3455. But after loading the
+	 * savegame and saving again, the buggy map array could be converted to new savegame
+	 * version. It didn't show up before r12070. */
+	if (CheckSavegameVersion(87)) UpdateVoidTiles();
 
 	/* If Load Scenario / New (Scenario) Game is used,
 	 *  a player does not exist yet. So create one here.