Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -ref910c360ba791f3bed99068845a1190cfb0dacd -r952d226004ac55aa2366e59d351b17d6c18dc584
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision ef910c360ba791f3bed99068845a1190cfb0dacd)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 952d226004ac55aa2366e59d351b17d6c18dc584)
@@ -1020,12 +1020,9 @@
             var assessmentSection = o as IAssessmentSection;
             var failureMechanism = o as IFailureMechanism;
 
-            var viewFailureMechanismContext = (IFailureMechanismContext<IFailureMechanism>) view.Data;
-            IFailureMechanism viewFailureMechanism = viewFailureMechanismContext.WrappedData;
-
             return assessmentSection != null
-                       ? ReferenceEquals(viewFailureMechanismContext.Parent, assessmentSection)
-                       : ReferenceEquals(viewFailureMechanism, failureMechanism);
+                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
+                       : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
         #endregion