diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 748aea4ddb2..26764072956 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -148,8 +148,17 @@ if (empty($reshook)) {
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$idprod = (int) GETPOST('idprod', 'int');
-		$bom_child = (int) GETPOST('bom_select', 'int');
+		$bom_child_id = (int) GETPOST('bom_id', 'int');
+        if($bom_child_id > 0){
+            $bom_child = new BOM($db);
+            $res = $bom_child->fetch($bom_child_id);
+            if($res){
+                $idprod = $bom_child->fk_product;
+            }
+        } else {
+			$idprod = (int) GETPOST('idprod', 'int');
+		}
+
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
@@ -173,7 +182,7 @@ if (empty($reshook)) {
 			$bomline = new BOMLine($db);
 			$bomline->fk_bom = $id;
 			$bomline->fk_product = $idprod;
-			$bomline->fk_bom_child = $bom_child;
+			$bomline->fk_bom_child = $bom_child_id;
 			$bomline->qty = $qty;
 			$bomline->qty_frozen = (int) $qty_frozen;
 			$bomline->disable_stock_change = (int) $disable_stock_change;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 82626c12fec..f62143188eb 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -202,13 +202,6 @@ if ($resql) {
 		// Product
 		print '<td style="padding-left: 5%" id="sub_bom_product_'.$sub_bom_line->id.'">'.$sub_bom_product->getNomUrl(1).'</td>';
 
-		// Sub-BOM
-		if ($sub_bom_line->fk_bom_child > 0) {
-			print '<td id="sub_bom_bom_'.$sub_bom_line->id.'">'.$sub_bom->getNomUrl(1).'</td>';
-		} else {
-			print '<td id="sub_bom_bom_'.$sub_bom_line->id.'">&nbsp;</td>';
-		}
-
 		// Qty
 		print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
 		if ($sub_bom_line->qty_frozen > 0) {