Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r26da131fa5dbcf95f9a16de6f81eb4acc8d1be14 -r277048d204ab4cfad4aa5de4d57ef38b56642c25
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 26da131fa5dbcf95f9a16de6f81eb4acc8d1be14)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
@@ -77,7 +77,7 @@
             };
             yield return new PropertyInfo<PipingInputContext, PipingInputContextProperties>
             {
-                CreateInstance = context => new PipingInputContextProperties(context, new CalculationInputPropertyChangeHandler())
+                CreateInstance = context => new PipingInputContextProperties(context, new ObservablePropertyChangeHandler(context.PipingCalculation))
             };
             yield return new PropertyInfo<PipingOutputContext, PipingOutputContextProperties>();
             yield return new PropertyInfo<RingtoetsPipingSurfaceLinesContext, RingtoetsPipingSurfaceLineCollectionProperties>
@@ -204,7 +204,7 @@
                     view.AssessmentSection = context.AssessmentSection;
                     view.PipingFailureMechanism = context.FailureMechanism;
                 },
-                CreateInstance = () => new PipingCalculationsView(new CalculationInputPropertyChangeHandler())
+                CreateInstance = () => new PipingCalculationsView()
             };
 
             yield return new ViewInfo<PipingInputContext, PipingCalculationScenario, PipingInputView>