Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r066d4ae414c52ddeadc1f768f90521bf6273f23f
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r066d4ae414c52ddeadc1f768f90521bf6273f23f
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r066d4ae414c52ddeadc1f768f90521bf6273f23f
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 066d4ae414c52ddeadc1f768f90521bf6273f23f)
@@ -572,11 +572,11 @@
 			var branchesArray:Array = _cv.ddm.branches.values();
 			
 			for(var i=0;i<branchesArray.length;i++){
-				if(branchesArray[i].targetUIID == toAct && !branchesArray[i].isActivityless){
+				if(branchesArray[i].targetUIID == toAct && branchesArray[i].hubUIID == fromAct && !branchesArray[i].isActivityless){ // Have to check both end points
 					return new LFError(Dictionary.getValue("cv_invalid_branch_target_to_activity", [_connectionActivities[1].title]));
 				}
 				
-				if(branchesArray[i].targetUIID == fromAct && !branchesArray[i].isActivityless) {
+				if(branchesArray[i].targetUIID == fromAct && branchesArray[i].hubUIID == toAct && !branchesArray[i].isActivityless) {
 					if(!SequenceActivity(branchesArray[i].sequenceActivity).stopAfterActivity && (fromAct != activeView.startHub))
 						return new LFError(Dictionary.getValue("cv_invalid_branch_target_from_activity", [_connectionActivities[0].title]));
 				}