Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r1b12943303cb3356c8f6674d852fc5d7280d1a37
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 1b12943303cb3356c8f6674d852fc5d7280d1a37)
@@ -410,8 +410,15 @@
 	private function checkIfBranchActive():Void {
 		for(var i=0; i<children_mc.length; i++) {
 			var learnerAct = children_mc[i];
-			if((learnerAct.isAttempted || learnerAct.isCompleted) && children_mc[i].activity.isBranchingActivity())
-				activeSequence = null;			// Possibly closing any other open sequence if a branching activity is active. TODO: review.
+			if((learnerAct.isAttempted || learnerAct.isCompleted) && learnerAct.activity.isBranchingActivity()) {
+				
+				if(!(model.findParent(learnerAct.activity, activeSequence))) {
+					activeSequence =  null;			// Possibly closing any other open sequence if a branching activity is active. TODO: review.
+				}
+				
+				if (_root.mode != 'preview' && isLearnerModule())
+					activeSequence = null;
+			}
 		}
 	}
 	
@@ -455,7 +462,7 @@
 				// check children of sequence (level 1) for current activity
 				if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeSequence))
 					removeAllChildrenAndInputSequence(children_mc[i].activity, false);
-			} else if(isChildAttempted && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity())) {
+			} else if(isChildAttempted && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity() || (children_mc[i].activity.isBranchingActivity() && (_root.mode == 'preview')))) {
 				if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeComplex))
 					removeAllChildrenAndInputComplex(children_mc[i].activity, children_mc[i].level, false);
 			}
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r1b12943303cb3356c8f6674d852fc5d7280d1a37
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rd45532cbe32ca96bd3a29545190a07e81fcea81e -r1b12943303cb3356c8f6674d852fc5d7280d1a37
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rd45532cbe32ca96bd3a29545190a07e81fcea81e -r1b12943303cb3356c8f6674d852fc5d7280d1a37
Binary files differ