Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -ref0999fbe49f3d750b2ecc5a66cd76bd01d52196 -r45604617ff03be0908ecfde13fdd12b795b520a2
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision ef0999fbe49f3d750b2ecc5a66cd76bd01d52196)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 45604617ff03be0908ecfde13fdd12b795b520a2)
@@ -1458,9 +1458,15 @@
 	if ((branchingActivityId == null) || (activity == null)) {
 	    return false;
 	}
+
 	Activity parentActivity = activity.getParentActivity();
-	return (parentActivity != null) && (parentActivity.getParentActivity() != null)
-		&& parentActivity.getParentActivity().getActivityId().equals(branchingActivityId);
+	while (parentActivity != null) {
+	    if (parentActivity.isBranchingActivity()) {
+		return parentActivity.getActivityId().equals(branchingActivityId);
+	    }
+	    parentActivity = parentActivity.getParentActivity();
+	}
+	return false;
     }
 
     @SuppressWarnings("unchecked")