diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index 65a26780c..2232006a1 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -238,7 +238,6 @@ class OrderDetailCore extends ObjectModel
 		FROM `'._DB_PREFIX_.'order_detail` od
 		LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (od.`product_id`=pd.`id_product`)
 		WHERE od.`download_hash` = \''.pSQL(strval($hash)).'\'
-		AND od.`product_attribute_id` = pd.`id_product_attribute`
 		AND pd.`active` = 1';
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
 	}
diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl
index f5da06cc9..e2b3ef446 100644
--- a/themes/default/order-detail.tpl
+++ b/themes/default/order-detail.tpl
@@ -87,7 +87,7 @@
 
 <div class="adresses_bloc clearfix">
 <br />
-<ul class="address item" {if $order->isVirtual()}style="display:none;"{/if}>
+<ul class="address item {if $order->isVirtual()}full_width{/if}">
 	<li class="address_title">{l s='Invoice'}</li>
 	{foreach from=$inv_adr_fields name=inv_loop item=field_item}
 		{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
@@ -100,7 +100,7 @@
 
 	{/foreach}
 </ul>
-<ul class="address alternate_item {if $order->isVirtual()}full_width{/if}">
+<ul class="address alternate_item" {if $order->isVirtual()}style="display:none;"{/if}>
 	<li class="address_title">{l s='Delivery'}</li>
 	{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
 		{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>