Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r6b18fa07b091772b673f0030a9155b528a096e3b -raf22577e43aebcdfab2b62d9ef1fae084ea2ab31
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r6b18fa07b091772b673f0030a9155b528a096e3b -raf22577e43aebcdfab2b62d9ef1fae084ea2ab31
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r9403e74e1e757f31f8c8e932f746fdf377044a14 -raf22577e43aebcdfab2b62d9ef1fae084ea2ab31
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 9403e74e1e757f31f8c8e932f746fdf377044a14)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision af22577e43aebcdfab2b62d9ef1fae084ea2ab31)
@@ -184,7 +184,7 @@
 				} else if(_activity instanceof ComplexActivity) {
 					if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
 						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
-					else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
+					else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity() && !_activity.isBranchingActivity())
 						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
 						
 				}