Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r4426 -r4435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 4426)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 4435)
@@ -373,7 +373,8 @@
     {
         // Synchronize scenario data (Note: do not attempt to synchronize the ModelFactors as these are set by the direct
         // properties in the scenario such as the Required Safeties. ModelFactors is just a place holder. 
-        location.CurrentScenario = designScenario.CloneInput(location.Name);
+        location.CurrentScenario = designScenario.CloneInput();
+        location.CurrentScenario.LocationName = location.Name;
         location.Scenarios.Clear();
         location.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder;
         location.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r4426 -r4435
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 4426)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 4435)
@@ -284,12 +284,12 @@
     /// </summary>
     /// <param name="locationName"></param>
     /// <returns></returns>
-    public DesignScenario CloneInput(string locationName)
+    public DesignScenario CloneInput()
     {
         // Synchronize scenario data (Note: do not attempt to synchronize the ModelFactors as these are set by the direct
         // properties in the scenario such as the Required Safeties. ModelFactors is just a place holder. 
         var newCurrentScenario = new DesignScenario();
-        newCurrentScenario.LocationName = locationName;
+        newCurrentScenario.LocationName = LocationName;
         newCurrentScenario.LocationScenarioID = LocationScenarioID;
         newCurrentScenario.PolderLevel = PolderLevel;
         newCurrentScenario.RiverLevel = RiverLevel;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r4426 -r4435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 4426)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 4435)
@@ -592,7 +592,8 @@
     {
         if (designScenario != null)
         {
-            location.CurrentScenario = designScenario.CloneInput(location.Name);
+            location.CurrentScenario = designScenario.CloneInput();
+            location.CurrentScenario.LocationName = location.Name;
             location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope =
                 designScenario.RequiredSafetyFactorStabilityInnerSlope;
             location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope =