Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs
===================================================================
diff -u -ra7a5111f48d0187ac735816b8366df498d237524 -r4aa24b0114123b208d69cbf6645152b02261687f
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision a7a5111f48d0187ac735816b8366df498d237524)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision 4aa24b0114123b208d69cbf6645152b02261687f)
@@ -60,12 +60,8 @@
         public MacroStabilityInwardsCalculationsView(CalculationGroup calculationGroup, MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
             : base(calculationGroup, failureMechanism, assessmentSection)
         {
-            surfaceLineObserver = new RecursiveObserver<MacroStabilityInwardsSurfaceLineCollection, MacroStabilityInwardsSurfaceLine>(() =>
+            surfaceLineObserver = new RecursiveObserver<MacroStabilityInwardsSurfaceLineCollection, MacroStabilityInwardsSurfaceLine>(UpdateGenerateCalculationsButtonState, rpslc => rpslc)
             {
-                UpdateColumns();
-                UpdateGenerateCalculationsButtonState();
-            }, rpslc => rpslc)
-            {
                 Observable = failureMechanism.SurfaceLines
             };
 
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -ra7a5111f48d0187ac735816b8366df498d237524 -r4aa24b0114123b208d69cbf6645152b02261687f
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision a7a5111f48d0187ac735816b8366df498d237524)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 4aa24b0114123b208d69cbf6645152b02261687f)
@@ -64,12 +64,8 @@
         public PipingCalculationsView(CalculationGroup calculationGroup, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
             : base(calculationGroup, failureMechanism, assessmentSection)
         {
-            surfaceLineObserver = new RecursiveObserver<PipingSurfaceLineCollection, PipingSurfaceLine>(() =>
+            surfaceLineObserver = new RecursiveObserver<PipingSurfaceLineCollection, PipingSurfaceLine>(UpdateGenerateCalculationsButtonState, rpslc => rpslc)
             {
-                UpdateColumns();
-                UpdateGenerateCalculationsButtonState();
-            }, rpslc => rpslc)
-            {
                 Observable = failureMechanism.SurfaceLines
             };