Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r8699a7e7934798d29851a8397f62838cecac282d -rdf5e8ca5c9464d8117f519041346afccef3d81f1 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 8699a7e7934798d29851a8397f62838cecac282d) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision df5e8ca5c9464d8117f519041346afccef3d81f1) @@ -1113,11 +1113,6 @@ } } - if(originalLearningDesign.getFloatingActivity() != null && newLearningDesign.getFloatingActivity() != null) { - // remove the Floating Activity in current design - newActivities.remove(originalLearningDesign.getFloatingActivity()); - } - Collection 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