Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.76 -r1.77
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	16 Jan 2009 05:57:09 -0000	1.76
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	16 Jan 2009 06:27:31 -0000	1.77
@@ -1113,11 +1113,6 @@
 	    }
 	}
 	
-	if(originalLearningDesign.getFloatingActivity() != null && newLearningDesign.getFloatingActivity() != null) {
-    	// remove the Floating Activity in current design
-    	newActivities.remove(originalLearningDesign.getFloatingActivity());
-    }
-
 	Collection<Activity> activities = newActivities.values();
 
 	// Go back and find all the grouped activities and assign them the new
@@ -1211,6 +1206,12 @@
 	if (uiidOffset == 0) {
 	    newLearningDesign.getActivities().clear();
 	}
+
+	if(originalLearningDesign.getFloatingActivity() != null && newLearningDesign.getFloatingActivity() != null) {
+    	// remove the Floating Activity in current design
+    	activities.remove(originalLearningDesign.getFloatingActivity());
+    }
+
 	newLearningDesign.getActivities().addAll(activities);
 
 	// On very rare occasions, we've had Hibernate try to save the branching