Index: /home/chris/Documents/magnolia-all/magnolia-module-workflow/src/main/java/info/magnolia/module/workflow/commands/flow/FlowCommand.java
===================================================================
--- /home/chris/Documents/magnolia-all/magnolia-module-workflow/src/main/java/info/magnolia/module/workflow/commands/flow/FlowCommand.java  (revision 6356)
+++ /home/chris/Documents/magnolia-all/magnolia-module-workflow/src/main/java/info/magnolia/module/workflow/commands/flow/FlowCommand.java  (working copy)
@@ -31,8 +31,6 @@
 import java.net.URLConnection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
 
 
 public class FlowCommand extends MgnlCommand {
@@ -101,8 +99,8 @@
      */
     public void prepareLaunchItem(Context context, LaunchItem launchItem) {
         Map map = context.getAttributes(Context.LOCAL_SCOPE);
+
         // find and remove all non serializable objects
-        List unsupportedEntries = new ArrayList();
         for (Iterator iter = map.keySet().iterator(); iter.hasNext();) {
             String key = (String) iter.next();
             Object val = map.get(key);
@@ -107,13 +105,9 @@
             String key = (String) iter.next();
             Object val = map.get(key);
             if (!(val instanceof Serializable)) {
-                unsupportedEntries.add(key);
+               iter.remove();
             }
         }
-        for (Iterator iter = unsupportedEntries.iterator(); iter.hasNext();) {
-            String key = (String) iter.next();
-            map.remove(key);
-        }
 
         StringMapAttribute attrs = AttributeUtils.java2attributes(map);
         launchItem.setAttributes(attrs);