Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.118.2.16 -r1.118.2.17
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	21 Aug 2015 15:22:53 -0000	1.118.2.16
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	21 Aug 2015 15:25:13 -0000	1.118.2.17
@@ -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")