Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r29790fcc3f047bb06be903969805d70f0f125329 -r540898bb1046a0815eb45d17bf6bf74264ae84c3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 29790fcc3f047bb06be903969805d70f0f125329)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 540898bb1046a0815eb45d17bf6bf74264ae84c3)
@@ -664,9 +664,7 @@
                 calculations.Add(calculation);
             }
 
-            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(
-                failureMechanism.SectionResults2,
-                failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
+            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
         }
 
         private static void ValidateAll(ClosingStructuresCalculationGroupContext context)
@@ -700,9 +698,7 @@
 
             parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
 
-            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(
-                context.FailureMechanism.SectionResults2,
-                context.FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>().ToArray());
+            ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(context.FailureMechanism);
 
             parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
             parentGroupContext.NotifyObservers();
@@ -790,9 +786,7 @@
             if (calculationGroupContext != null)
             {
                 calculationGroupContext.WrappedData.Children.Remove(context.WrappedData);
-                ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(
-                    context.FailureMechanism.SectionResults2,
-                    context.FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
+                ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(context.FailureMechanism);
                 calculationGroupContext.NotifyObservers();
             }
         }