diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
index 11d7f4439..d7f18954e 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
@@ -13,7 +13,7 @@
 
         <many-to-one name="orderElement" cascade="none" column="ORDER_ELEMENT_ID"/>
 
-        <set name="dependenciesWithThisOrigin">
+        <set name="dependenciesWithThisOrigin" cascade="all">
             <key column="ORIGIN"></key>
             <one-to-many class="Dependency" />
         </set>
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/services/TaskElementServiceTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/services/TaskElementServiceTest.java
index 2fba5bb02..f68e9fc0c 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/services/TaskElementServiceTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/services/TaskElementServiceTest.java
@@ -152,24 +152,24 @@ public class TaskElementServiceTest {
     public void savingTaskElementSavesAssociatedDependencies() {
         Task child1 = createValidTask();
         Task child2 = createValidTask();
-        TaskGroup taskGroup = createValidTaskGroup();
-        taskGroup.addTaskElement(child1);
-        taskGroup.addTaskElement(child2);
-        Dependency dependency = Dependency.createDependency(child1, child2,
+        taskElementService.save(child2);
+        Task oldChild2 = child2;
+        flushAndEvict(child2);
+        child2 = (Task) taskElementService.findById(child2.getId());
+        Dependency dependency = Dependency.createDependency(child1, oldChild2,
                 Type.START_END);
-        taskElementService.save(taskGroup);
-        flushAndEvict(taskGroup);
-        TaskGroup reloaded = (TaskGroup) taskElementService.findById(taskGroup
-                .getId());
-        assertThat(reloaded.getChildren().get(0)
-                .getDependenciesWithThisOrigin().size(), equalTo(1));
-        assertTrue(reloaded.getChildren().get(0)
-                .getDependenciesWithThisDestination().isEmpty());
+        taskElementService.save(child1);
+        flushAndEvict(child1);
+        TaskElement child1Reloaded = (TaskElement) taskElementService
+                .findById(child1.getId());
+        assertThat(child1Reloaded.getDependenciesWithThisOrigin().size(),
+                equalTo(1));
+        assertTrue(child1Reloaded.getDependenciesWithThisDestination()
+                .isEmpty());
 
-        assertThat(reloaded.getChildren().get(1)
-                .getDependenciesWithThisDestination().size(), equalTo(1));
-        assertTrue(reloaded.getChildren().get(1)
-                .getDependenciesWithThisOrigin().isEmpty());
+        assertThat(child2.getDependenciesWithThisDestination().size(),
+                equalTo(1));
+        assertTrue(child2.getDependenciesWithThisOrigin().isEmpty());
     }
 
     @Test