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 8b30133a7..12c6842b6 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
@@ -25,6 +25,7 @@
 
         <joined-subclass name="Task">
             <key column="TASK_ELEMENT_ID"></key>
+            <many-to-one name="hoursGroup" cascade="none"/>
         </joined-subclass>
 
         <joined-subclass name="TaskGroup">
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 f1a631030..50272fced 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
@@ -49,6 +49,8 @@ public class TaskElementServiceTest {
     @Autowired
     private IOrderService orderService;
 
+    private HoursGroup associatedHoursGroup;
+
     @Test
     public void canSaveTask() {
         Task task = createValidTask();
@@ -58,11 +60,15 @@ public class TaskElementServiceTest {
         assertThat(fromDB.getId(), equalTo(task.getId()));
         assertThat(fromDB, is(Task.class));
         checkProperties(task, fromDB);
+        HoursGroup reloaded = ((Task) fromDB).getHoursGroup();
+        assertThat(reloaded.getId(), equalTo(reloaded.getId()));
     }
 
     private Task createValidTask() {
-        Task task = Task.createTask(new HoursGroup());
+        associatedHoursGroup = new HoursGroup();
+        Task task = Task.createTask(associatedHoursGroup);
         OrderLine orderLine = createOrderLine();
+        orderLine.addHoursGroup(associatedHoursGroup);
         task.setOrderElement(orderLine);
         return task;
     }