diff --git a/Makefile b/Makefile
index 391af38880f3d74ee863fc5bc1c161d8ba593dcb..6bf7f4420ce53ae40a56d5eaf736b0001af14357 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=downloads_for_sale
 PLUGINTYPE=vmcustom
-VERSION=1.7
+VERSION=1.8
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 
diff --git a/downloads_for_sale.php b/downloads_for_sale.php
index ee38f199ce676b31c11fa1e651048800c64b17d7..80661e44dd661aa6258cde24e97591caabe68dd1 100644
--- a/downloads_for_sale.php
+++ b/downloads_for_sale.php
@@ -433,6 +433,7 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 			case 'paid_download': 
 				if ($orderitem) {
 					$order = $this->orderDataFromItem ($orderitem->virtuemart_order_item_id);
+					$field->order = $order;
 				} elseif ($cuid>0) {
 					$orderModel = VmModel::getModel('orders');
 					foreach ($orderModel->getOrdersList($cuid, true) as $ol) {
@@ -440,6 +441,7 @@ class plgVmCustomDownloads_for_Sale extends vmCustomPlugin {
 						foreach ($o['items'] as $i) {
 							if ($i->virtuemart_product_id == $field->virtuemart_product_id && in_array($i->order_status, $field->paid_status)) {
 								$order = $o['details']['BT'];
+								$field->order = $o;
 							}
 						}
 					}
diff --git a/downloads_for_sale.xml b/downloads_for_sale.xml
index e815328932f64bb8598a892d22e1d0ae50eef46d..35418b1da91acdca15feeb20895da2ade1672f4b 100644
--- a/downloads_for_sale.xml
+++ b/downloads_for_sale.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net/</authorUrl>
     <copyright>Copyright (C) 2013 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl.html GNU/GPL v3+</license>
-    <version>1.7</version>
+    <version>1.8</version>
     <description>VMCUSTOM_DLSALE_DESC</description>
     <files>
         <filename plugin="downloads_for_sale">downloads_for_sale.php</filename>
diff --git a/releases/plg_vmcustom_downloads_for_sale_v1.8.zip b/releases/plg_vmcustom_downloads_for_sale_v1.8.zip
new file mode 100644
index 0000000000000000000000000000000000000000..2effa428ca08a67b268028b63db4e1afdfa2e62b
Binary files /dev/null and b/releases/plg_vmcustom_downloads_for_sale_v1.8.zip differ