Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java	10 Sep 2015 11:03:43 -0000	1.4.2.2
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java	24 Nov 2015 14:05:07 -0000	1.4.2.3
@@ -48,10 +48,12 @@
 
     @Override
     public void endComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException {
-	if (activity.isActivityReadOnly()) {
-	    lastReadOnlyActivity = activity;
-	} else if (firstAddedActivity == null) {
-	    firstAddedActivity = activity;
+	if (!activity.isFloatingActivity()) {
+	    if (activity.isActivityReadOnly()) {
+		lastReadOnlyActivity = activity;
+	    } else if (firstAddedActivity == null) {
+		firstAddedActivity = activity;
+	    }
 	}
     }
 
@@ -63,13 +65,12 @@
     /** Creates an ActivityPortfolio. */
     @Override
     public void endSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException {
-	if (activity.isActivityReadOnly()) {
-	    // skip Floating Activity as it is not in the main flow
-	    if ((activity.getParentActivity() == null) || !activity.getParentActivity().isFloatingActivity()) {
+	if (!activity.isFloating()) {
+	    if (activity.isActivityReadOnly()) {
 		lastReadOnlyActivity = activity;
+	    } else if (firstAddedActivity == null) {
+		firstAddedActivity = activity;
 	    }
-	} else if (firstAddedActivity == null) {
-	    firstAddedActivity = activity;
 	}
     }
 }
\ No newline at end of file