Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rb71de54d1c3defbfc79dd9704fc484851c754853 -r1085752ee44b8a6482a2a5784d09e36e693d7a7a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision b71de54d1c3defbfc79dd9704fc484851c754853)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 1085752ee44b8a6482a2a5784d09e36e693d7a7a)
@@ -151,15 +151,23 @@
 				//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
 				for (var i=0; i<optionalOnCanvas.length; i++){
 					//trace ("testing Optional on Canvas "+i)
-					if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID){
+					if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID ){
 						if (ca.hitTest(optionalOnCanvas[i])){
 							if (optionalOnCanvas[i].locked == true){
 								var msg:String = Dictionary.getValue('act_lock_chk');
 								LFMessage.showMessageAlert(msg);
-							}else{
-								_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
+							}else{
+								if (ca.activity.isGateActivity()){
+									ca._x = ca.activity.xCoord;
+									ca._y = ca.activity.yCoord;
+									var msg:String = Dictionary.getValue('cv_gateoptional_hit_chk');
+									LFMessage.showMessageAlert(msg);
+								}else {
+									_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
+								}
 							}						
-						}
+						}
+						
 					}
 				}