diff --git a/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json b/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json
index da2fbe1bb..53134f210 100644
--- a/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json
+++ b/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json
@@ -2,7 +2,7 @@
   {
     "Type": "SystemBody",
     "Payload": {
-      "UniqueID": "luna",
+      "UniqueID": "moon-luna",
       "Name": "Luna",
       "Parent": "Earth",
       "Colonizable": true,
diff --git a/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json b/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json
index 0106257da..08faed9e0 100644
--- a/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json
+++ b/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json
@@ -25,7 +25,17 @@
         "sol"
       ],
       "Bodies": [
-        "planet-earth"
+        "mercury",
+        "venus",
+        "planet-earth",
+        "moon-luna",
+        "mars",
+        "jupiter",
+        "moon-io",
+        "saturn",
+        "moon-titan",
+        "uranus",
+        "neptune"
       ],
       "SurveyRings": [
         { "RingRadiusInAU": 2, "Count": 2 }
diff --git a/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs b/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs
index d4b4258da..6c9792490 100644
--- a/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs
+++ b/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs
@@ -393,7 +393,7 @@ public static StarSystem LoadFromBlueprint(Game game, SystemBlueprint systemBlue
             }
 
             // Load bodies
-            foreach(var (id, body) in game.StartingGameData.SystemBodies)
+            foreach(var id in systemBlueprint.Bodies)
             {
                 var bodyEntity = SystemBodyFactory.CreateFromBlueprint(game, system, rootStar, galaxyGen.Settings.J2000, new SensorProfileDB(), game.StartingGameData.SystemBodies[id]);
             }