Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -re1c507a1e1171f32fbcfe0370a184ccaea623ff1
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -re1c507a1e1171f32fbcfe0370a184ccaea623ff1
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r4b5eefb8457b66f51aabb41cf530d595a4dd753a -re1c507a1e1171f32fbcfe0370a184ccaea623ff1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 4b5eefb8457b66f51aabb41cf530d595a4dd753a)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision e1c507a1e1171f32fbcfe0370a184ccaea623ff1)
@@ -165,25 +165,21 @@
 			tActivities.addItem({label: "--Selection--", data: 0});	 // TODO: Label required
 		
 		while(_activityUIID != null) {
-
+			
 			var transObj:Object = getCanvas().ddm.getTransitionsForActivityUIID(_activityUIID);
 		
 			_activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : getParentActivity(_activity);
 			
-			if (_activity != null) {
+			if(_activity != null) {
 				if(_activity instanceof _class) {
 					if(isBranching) tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
 					else tActivities.addItem({label: _activity.title, data: _activity});
 				} else if(_activity instanceof ComplexActivity) {
-					var _seqActivity = getCanvas().ddm.getActivityByUIID(selectedItem.activity.parentUIID);
-					
-					if(_activity.activityUIID != _seqActivity.activityUIID && _activity.activityUIID != _seqActivity.parentUIID) {
+					if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
+						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+					else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
+						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
 						
-						if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
-							getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
-						else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
-							getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
-					}
 				}
 			}
 			
@@ -758,7 +754,14 @@
 		if(parentAct != null) {
 			if(parentAct.isSequenceActivity() && SequenceActivity(parentAct).firstActivityUIID != selectedAct.activityUIID)
 				return null;
+			else if(parentAct.isSequenceActivity())
+				return getParentActivity(parentAct);
 			
+			var transObj:Object = getCanvas().ddm.getTransitionsForActivityUIID(parentAct.activityUIID);
+		
+			return (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : getParentActivity(parentAct);
+			
+			
 			return parentAct;
 		}