Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r1484 -r1693
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1484)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1693)
@@ -70,6 +70,7 @@
                 // If something in the calculation results changes, the file has to be manually deleted
                 // It will then be generated again in the else block of this statement
                 outputString = File.ReadAllText(outputFilename);
+                Debug.WriteLine("Skipping single core calculation Macrostability; results are read from file");
             }
             else
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r1558 -r1693
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 1558)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 1693)
@@ -105,20 +105,6 @@
         public virtual string Name { get; set; }
 
         /// <summary>
-        /// Updates the locations for scenarios.
-        /// </summary>
-        public void UpdateLocationsForScenarios()
-        {
-            foreach (Location location in this.Locations)
-            {
-                foreach (DesignScenario scenario in location.Scenarios)
-                {
-                    scenario.Location = location;
-                }
-            }
-        }
-
-        /// <summary>
         /// Gets the locations.
         /// </summary>
         /// <value>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r1644 -r1693
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 1644)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 1693)
@@ -31,6 +31,7 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
 
@@ -66,13 +67,14 @@
             var designCalculatorTasks = new List<DesignCalculatorTask>();
             for (int locationIndex = 0; locationIndex < damProjectData.Dike.Locations.Count; locationIndex++)
             {
-                var location = damProjectData.Dike.Locations[locationIndex];
+                var location = damProjectData.Dike.Locations[locationIndex].Copy();
                 for (int subSoilScenarioIndex = 0; subSoilScenarioIndex < location.Segment.SoilProfileProbabilities.Count; subSoilScenarioIndex++)
                 {
                     var soiProfileProbability = location.Segment.SoilProfileProbabilities[subSoilScenarioIndex];
                     for (int designScenarioIndex = 0; designScenarioIndex < location.Scenarios.Count; designScenarioIndex++)
                     {
                         DesignScenario designScenario = location.Scenarios[designScenarioIndex];
+                        designScenario.Location = location;
                         var projectPath = damProjectData.ProjectPath != "" ? damProjectData.ProjectPath : Directory.GetCurrentDirectory();
                         var designResults = new List<DesignResult>();
                         var calculationMessages = new List<LogMessage>();
@@ -83,7 +85,7 @@
                             DesignScenario = designScenario,
                             ProjectPath = projectPath,
                             CalculationMap = damProjectData.CalculationMap,
-                            FailureMechanismeCalculationSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification,
+                            FailureMechanismeCalculationSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.Copy(),
                             DesignResults = designResults,
                             CalculationMessages = calculationMessages
                         });
@@ -123,7 +125,7 @@
                 damKernelInput.DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification;
                 damKernelInput.RiverLevelHigh = designScenario.RiverLevel;
                 damKernelInput.RiverLevelLow = designScenario.RiverLevelLow;
-                damKernelInput.FilenamePrefix = String.Format("Loc({0})_Sce({1})", designScenario.Location.Name, designScenario.LocationScenarioID);
+                damKernelInput.FilenamePrefix = String.Format("Loc({0})_Sce({1})", location.Name, designScenario.LocationScenarioID);
                 AnalysisType analysisType = DamProjectCalculationSpecification.SelectedAnalysisType;
                 SynchronizeScenarioDataWithLocationData(designScenario, location);
                 IKernelDataInput kernelDataInput;