diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
index 45abe177e..d342cef72 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
@@ -93,7 +93,7 @@ public abstract class OrderElement {
         return description;
     }
 
-    public abstract OrderLineGroup asContainer();
+    public abstract OrderLineGroup toContainer();
 
     public abstract void forceLoadHourGroups();
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
index af036b2d7..7c752d119 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
@@ -26,13 +26,13 @@ public class OrderLine extends OrderElement {
     }
 
     @Override
-    public OrderLineGroup asContainer() {
+    public OrderLineGroup toContainer() {
         OrderLineGroup result = new OrderLineGroup();
         result.setName(getName());
         result.setInitDate(getInitDate());
         result.setEndDate(getEndDate());
-        // FIXME
-        // result.setHoursGroups(getHoursGroups());
+        result.add(this);
+
         return result;
     }
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
index 34adaa2d2..f18eed250 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
@@ -42,7 +42,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
     }
 
     @Override
-    public OrderLineGroup asContainer() {
+    public OrderLineGroup toContainer() {
         return this;
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java
index 80b87d063..1c0271929 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java
@@ -68,7 +68,8 @@ public class OrderElementTreeModel extends SimpleTreeModel {
     }
 
     private void addOrderElementAtImpl(SimpleTreeNode node, OrderElement orderElement) {
-        addOrderElementAtImpl(node, orderElement, node.getChildCount());
+        IOrderLineGroup container = turnIntoContainerIfNeeded(node);
+        container.add(orderElement);
     }
 
     private void addOrderElementAtImpl(SimpleTreeNode destinationNode, OrderElement orderElement,
@@ -84,7 +85,7 @@ public class OrderElementTreeModel extends SimpleTreeModel {
             return (IOrderLineGroup) selectedForTurningIntoContainer
                     .getData();
         OrderElement toBeTurned = asOrderLine(selectedForTurningIntoContainer);
-        OrderLineGroup asContainer = toBeTurned.asContainer();
+        OrderLineGroup asContainer = toBeTurned.toContainer();
         parentContainer.replace(toBeTurned, asContainer);
         return asContainer;
     }
@@ -203,4 +204,4 @@ public class OrderElementTreeModel extends SimpleTreeModel {
         orderLineGroup.remove(asOrderLine(value));
     }
 
-}
\ No newline at end of file
+}