diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
index 3618aa940..2a4db2624 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
@@ -15,9 +15,9 @@
 
     <many-to-one name="type" class="LabelType" column="LABEL_TYPE_ID"/>
 
-    <set name="orderElements" inverse="false">
-        <key column="LABEL_ID"/>
-        <one-to-many class="org.navalplanner.business.orders.entities.OrderElement"/>
+    <set name="orderElements" table="ORDER_ELEMENT_LABEL">
+        <key column="LABEL_ID" not-null="false"/>
+        <many-to-many column="ORDER_ELEMENT_ID" class="org.navalplanner.business.orders.entities.OrderElement"/>
     </set>
 </class>
 
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
index e82cd67d2..af972fbc7 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
@@ -45,9 +45,9 @@
             <one-to-many class="org.navalplanner.business.advance.entities.AdvanceAssigment"></one-to-many>
         </set>
 
-		<set name="labels" access="field" cascade="delete-orphan">
-			<key column="ORDER_ELEMENT_ID" />
-			<one-to-many class="org.navalplanner.business.labels.entities.Label" />
+		<set name="labels" table="ORDER_ELEMENT_LABEL" access="field">
+			<key column="ORDER_ELEMENT_ID" not-null="true"/>
+			<many-to-many column="LABEL_ID" class="org.navalplanner.business.labels.entities.Label" />
 		</set>
 
         <!-- Inverse navigation from OrderElement to OrderLineGroup -->
diff --git a/navalplanner-webapp/src/test/resources/navalplanner-webapp-spring-config-test.xml b/navalplanner-webapp/src/test/resources/navalplanner-webapp-spring-config-test.xml
index 4a5b37c06..64f79ccda 100644
--- a/navalplanner-webapp/src/test/resources/navalplanner-webapp-spring-config-test.xml
+++ b/navalplanner-webapp/src/test/resources/navalplanner-webapp-spring-config-test.xml
@@ -51,6 +51,9 @@
                 <value>
                     org/navalplanner/business/calendars/entities/Calendars.hbm.xml
                 </value>
+                <value>
+                    org/navalplanner/business/labels/entities/Labels.hbm.xml
+                </value>
             </list>
         </property>