Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r2a754b5c9c11bfe83d3c57899310e69bdc3b9c9f -r8957e073fb6bf0d540e39b0c0358b06537fe91df
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r2a754b5c9c11bfe83d3c57899310e69bdc3b9c9f -r8957e073fb6bf0d540e39b0c0358b06537fe91df
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r2a754b5c9c11bfe83d3c57899310e69bdc3b9c9f -r8957e073fb6bf0d540e39b0c0358b06537fe91df
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 2a754b5c9c11bfe83d3c57899310e69bdc3b9c9f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 8957e073fb6bf0d540e39b0c0358b06537fe91df)
@@ -345,14 +345,20 @@
 					ca._x = 0;
 					ca._y = 0;
 				} else {
+					
 					var sequenceActivity:Activity = _canvasModel.ddm.getActivityByUIID(ca.activity.parentUIID);
 			
-					if(sequenceActivity != null)
-						if(!_canvasModel.moveOptionalSequenceCA(ca, sequenceActivity))
-							activitySnapBack(ca);
-					else
-						activitySnapBack(ca);
+					if(sequenceActivity.isOptionalSequenceActivity(_canvasModel.ddm.getActivityByUIID(sequenceActivity.parentUIID))) {
+						if (ca._x > optionalOnCanvas[i].getVisibleWidth() || 
+								ca._x < -ca.getVisibleWidth() ||
+								ca._y < -ca.getVisibleHeight() - sequenceActivity.yCoord ||
+								ca._y > optionalOnCanvas[i].getVisibleHeight() - sequenceActivity.yCoord) {
+						} else {
+							_canvasModel.moveOptionalSequenceCA(ca, sequenceActivity);
+						}
+					}
 					
+					activitySnapBack(ca);
 				}
 			}
 			
@@ -434,7 +440,7 @@
 				ca._x = ca.activity.endXCoord;
 				ca._y = ca.activity.endYCoord;
 			}
-				
+			
 		} else {
 			ca._x = ca.activity.xCoord;
 			ca._y = ca.activity.yCoord;