diff --git a/ordernumbers_woocommerce.php b/ordernumbers_woocommerce.php
index f0d94638b006b7408d9bf25af901e83dac4c07c8..080dd8ca0a27274846f316bd5937670c0ac7d6eb 100644
--- a/ordernumbers_woocommerce.php
+++ b/ordernumbers_woocommerce.php
@@ -444,28 +444,15 @@ class OpenToolsOrdernumbers extends OpenToolsOrdernumbersBasic {
 		// Patch by OpenTools implements the generic interface, so nothing special needs to be done
 	}
 
-	
-	
 	/** ************************************************************
 	 *  Support for WooCommerce Print Invoice and Delivery Notes (woocommerce-delivery-notes) by Triggvy Gunderson
 	 ** ************************************************************
-	 *
-	 *  - Patch has been sent to the author to implement generic invoice number filters
-	 *  - Removing the invoice numbering options and adding a link to this 
-	 *    plugin's configuration has to be coded in the other plugin, because
-	 *    it does not use the WP options API...
 	 */
 	 
-	/**
-	 * Initialize support for WooCommerce Print Invoice and Delivery Notes
-	 */
 	protected function thirdparty_wc_delivery_notes_init() {
 		// Patch by OpenTools implements the generic interface, so nothing special needs to be done
 	}
 
-	
-	
-	
 // END THIRD-PARTY PLUGIN SUPPORT
 
 }
diff --git a/ordernumbers_woocommerce_basic.php b/ordernumbers_woocommerce_basic.php
index d7bd24437e3cd103d0732d73799d1ae186387308..90b82e5e1bc837bf5f1db3297227dc69d8bdb6f8 100644
--- a/ordernumbers_woocommerce_basic.php
+++ b/ordernumbers_woocommerce_basic.php
@@ -426,7 +426,7 @@ class OpenToolsOrdernumbersBasic {
 // 		$reps["[year2]"] = date ("y", $utime);
 	}
 
-	function generateNumber($orderid, $order, $type='ordernumber') {
+	function generateNumber($default, $order, $type='ordernumber') {
 		if ($this->numbers_activated($type)) {
 			$fmt     = get_option ($type.'_format',  "#");
 			$ctrsettings = array(
@@ -440,10 +440,10 @@ class OpenToolsOrdernumbersBasic {
 			$customvars = get_option ('ordernumber_variables',   array());
 
 			$number = $this->helper->createNumber ($fmt, $type, $order, $customvars, $ctrsettings);
-			update_post_meta( $orderid, $this->ordernumber_meta.$type, $number );
+			update_post_meta( $order->id, $this->ordernumber_meta.$type, $number );
 			return $number;
 		} else {
-			return $orderid;
+			return $default;
 		}
 	}
 	
@@ -468,12 +468,12 @@ class OpenToolsOrdernumbersBasic {
 		return $number;
 	}
 
-	function get_or_create_number($orderid, $order, $type = 'ordernumber') {
-		$stored_number = get_post_meta( $orderid, $this->ordernumber_meta.$type, true);
+	function get_or_create_number($default, $order, $type = 'ordernumber') {
+		$stored_number = get_post_meta( $order->id, $this->ordernumber_meta.$type, true);
 		if (!empty($stored_number)) {
 			return $stored_number;
 		} else {
-			return $this->generateNumber($orderid, $order, $type);
+			return $this->generateNumber($order->id, $order, $type);
 		}
 	}