diff --git a/src/engine/db/handlers/dbBuildingHandler.java b/src/engine/db/handlers/dbBuildingHandler.java
index d11d2642..acd66548 100644
--- a/src/engine/db/handlers/dbBuildingHandler.java
+++ b/src/engine/db/handlers/dbBuildingHandler.java
@@ -868,7 +868,9 @@ public class dbBuildingHandler extends dbHandlerBase {
                 }
                 else
                 {
-                    BuildingManager.prop_meshes.get(rs.getInt("propID")).add(rs.getInt("meshID"));
+                    ArrayList<Integer> meshes = BuildingManager.prop_meshes.get(rs.getInt("propID"));
+                    meshes.add(rs.getInt("meshID"));
+                    //BuildingManager.prop_meshes.get(rs.getInt("propID")).add(rs.getInt("meshID"));
                 }
             }
 
diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java
index 595be009..6a923f3e 100644
--- a/src/engine/gameManager/BuildingManager.java
+++ b/src/engine/gameManager/BuildingManager.java
@@ -989,7 +989,10 @@ public enum BuildingManager {
             if(prop_meshes.containsKey(building.meshUUID) == false)
                 return;//no meshes to load for this prop
 
-            ArrayList<Integer> meshes = prop_meshes.get(building.meshUUID);
+            //ArrayList<Integer> meshes = prop_meshes.get(building.meshUUID);
+            int buildingMeshUUID = building.meshUUID;
+            int blueprintMeshUUID = building.getBlueprint().getMeshForRank(building.rank);
+            ArrayList<Integer> meshes = prop_meshes.get(building.getBlueprint().getMeshForRank(building.rank));
             for (int mesh : meshes) {
 
                 if (!mesh_heights.containsKey(mesh) || !mesh_triangle_points.containsKey(mesh))