Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -rb7baeaebf9509f34b2d61d48cfc6dacd53d09576 -reedece3b6554bd6c2bc28d6c7e32d7bdece08040
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision b7baeaebf9509f34b2d61d48cfc6dacd53d09576)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision eedece3b6554bd6c2bc28d6c7e32d7bdece08040)
@@ -555,6 +555,9 @@
 		for(var i=0; i<design.branchMappings.length;i++){
 			var mdto = design.branchMappings[i];
 			var newMappingEntry:BranchActivityEntry;
+			
+			Debugger.log("Branch Mapping groupUIID: " + mdto.groupUIID, Debugger.CRITICAL, "setDesign", "DDM");
+			
 			if(mdto.groupUIID != null) {
 				newMappingEntry = new GroupBranchActivityEntry(mdto.entryID, mdto.entryUIID, getGroupByUIID(mdto.groupUIID), SequenceActivity(getActivityByUIID(mdto.sequenceActivityUIID)), BranchingActivity(getActivityByUIID(mdto.branchingActivityUIID)));
 			} else if(mdto.condition != null) {
@@ -805,18 +808,17 @@
 		design.branchMappings = new Array();
 		var classMappingEntries = _branchMappings.values();
 		
-		if(classMappingEntries.length > 0) {
-			for(var i=0; i<classMappingEntries.length; i++) {
+		if(classMappingEntries.length > 0)
+			for(var i=0; i<classMappingEntries.length; i++)
 				if((classMappingEntries[i].branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE 
 						&& classMappingEntries[i].group != null) ||
 					(classMappingEntries[i].branchingActivity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE 
 						&& classMappingEntries[i].condition != null 
-						&& classMappingEntries[i].condition.toolActivity.activityUIID == classMappingEntries[i].branchingActivity.toolActivityUIID)) {
+						&& classMappingEntries[i].condition.toolActivity.activityUIID == classMappingEntries[i].branchingActivity.toolActivityUIID) || 
+					(classMappingEntries[i].branchingActivity.activityTypeID == Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE
+						&& classMappingEntries[i].group != null))
 					design.branchMappings.push(classMappingEntries[i].toData());
-				}
-			}
-		}
-		
+					
 		return design;
 	}