Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rf878650ccff673e3c9c7020ae9ed0125cf573454 -rfd491b0058bd609c38143eb517fca36240fb0973
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rf878650ccff673e3c9c7020ae9ed0125cf573454 -rfd491b0058bd609c38143eb517fca36240fb0973
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r93a02624adff176042f98649f582d3c919b652d4 -rfd491b0058bd609c38143eb517fca36240fb0973
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision fd491b0058bd609c38143eb517fca36240fb0973)
@@ -79,9 +79,14 @@
 	 */
 	public function clone():SequenceActivity{
 		var dto:Object = toData();
-		var sa = new SequenceActivity();
-		sa.populateFromDTO(dto);
-		return sa;
+		if(dto != null) {
+			var sa = new SequenceActivity();
+			sa.populateFromDTO(dto);
+			
+			return sa;
+		}
+		
+		return null;
 	}
 	
 	public function set firstActivityUIID(a:Number):Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as
===================================================================
diff -u -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3 -rfd491b0058bd609c38143eb517fca36240fb0973
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	(.../CanvasBranchingDiagram.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	(.../CanvasBranchingDiagram.as)	(revision fd491b0058bd609c38143eb517fca36240fb0973)
@@ -182,7 +182,7 @@
 			for(var i=0; i<sequences.length; i++) {
 				 var acts:Array = _ddm.getComplexActivityChildren(sequences[i].activityUIID);
 				 
-				 if(!SequenceActivity(sequences[i]).isDefault)
+				 if(!SequenceActivity(sequences[i]).isDefault && !SequenceActivity(sequences[i]).stopAfterActivity)
 					_branchingDetails.push({firstActivityUIID: SequenceActivity(sequences[i]).firstActivityUIID, noActivities: acts.length, hasEndBranch: !sequences[i].stopAfterActivity});
 			}
 		} 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -rf878650ccff673e3c9c7020ae9ed0125cf573454 -rfd491b0058bd609c38143eb517fca36240fb0973
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision f878650ccff673e3c9c7020ae9ed0125cf573454)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision fd491b0058bd609c38143eb517fca36240fb0973)
@@ -618,7 +618,6 @@
 		
 		pasteActivityItem(newSequenceActivity, o);
 		
-		
 		return newSequenceActivity;
 	}
 	
@@ -706,6 +705,7 @@
 		
 		var children:Array = _ddm.getComplexActivityChildren(activity.activityUIID);
 		var activityCopy:Activity;
+		var defaultBranchCopy:Activity;
 		
 		for(var i=0; i<children.length; i++){
 			if(children[i] instanceof ToolActivity) activityCopy = pasteToolItem(children[i], o, toolContentIDMap.get(children[i].toolContentID), parentAct);
@@ -726,8 +726,14 @@
 					activityMap.put(children[i].activityUIID, dataObj);
 				}
 				
-				if(activity.firstActivityUIID == children[i].activityUIID)
+				if(activity.firstActivityUIID == children[i].activityUIID) {
 					parentAct.firstActivityUIID = activityCopy.activityUIID;
+				}
+				
+			} else if(activity.isBranchingActivity()) {
+				if(activity.firstActivityUIID == children[i].activityUIID) {
+					parentAct.firstActivityUIID = activityCopy.activityUIID;
+				}
 			}
 		}
 	}