diff --git a/src/citymania/zoning.cpp b/src/citymania/zoning.cpp
index 34ed0506ed..6ffe6e1c8f 100644
--- a/src/citymania/zoning.cpp
+++ b/src/citymania/zoning.cpp
@@ -178,10 +178,15 @@ TileHighlight GetTileHighlight(const TileInfo *ti) {
             const SpriteID pal[] = {PAL_NONE, SPR_PALETTE_ZONING_YELLOW, SPR_PALETTE_ZONING_ORANGE, SPR_PALETTE_ZONING_RED};
             th.border_color = pal[b.second];
         }
-        auto z = getter(ti->tile);
+        auto check_tile = ti->tile;
+        if (IsTileType (ti->tile, MP_STATION)) {
+            auto station =  Station::GetByTile(ti->tile);
+            if (station) check_tile = station->xy;
+        }
+        auto z = getter(check_tile);
         if (z) {
             const SpriteID pal[] = {PAL_NONE, PALETTE_TINT_YELLOW, PALETTE_TINT_ORANGE, PALETTE_TINT_RED};
-            th.ground_pal = th.structure_pal = pal[b.second];
+            th.ground_pal = th.structure_pal = pal[z];
         }
     }
 
diff --git a/src/rev.cpp b/src/rev.cpp
index 3f67ef5ad4..6af5fae656 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
 const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 0 << 19 | 28004;
 
 
-const char _citymania_version[] = "20200205-master-mf81537df1e 05.02.20";
+const char _citymania_version[] = "20200205-master-m1b36fd5838 05.02.20";