diff --git a/Makefile b/Makefile
index b45fc7bb67af3559d831c0add60f7cc8023c45a9..a3c86b29ef3e75d1f7275a46d0a059aaad90f71e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BASE=rules_shipping
 BASE_ADV=rules_shipping_advanced
 PLUGINTYPE=vmshipment
 ZIPBASE=opentools_vm2
-VERSION=4.99
+VERSION=4.99a
 
 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html
 PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99a.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99a.zip
new file mode 100644
index 0000000000000000000000000000000000000000..92947540e36ab614d8a306126046429c709edf58
Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99a.zip differ
diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.99a.zip b/releases/plg_opentools_vm2_rules_shipping_v4.99a.zip
new file mode 100644
index 0000000000000000000000000000000000000000..992681dad1a26333f19dfd95ff191fb951b1e051
Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_v4.99a.zip differ
diff --git a/rules_shipping.xml b/rules_shipping.xml
index c00751e4274f24656262258abe2dd8729363cf9c..e99ee3758e38684b1395f95dc19bfcffab577a9c 100644
--- a/rules_shipping.xml
+++ b/rules_shipping.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<extension version="1.5" type="plugin" group="vmshipment" method="upgrade">
+<extension version="2.5" type="plugin" group="vmshipment" method="upgrade">
     <name>VMSHIPMENT_RULES</name>
     <creationDate>2014-09-14</creationDate>
     <author>Reinhold Kainhofer</author>
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>4.99</version>
+    <version>4.99a</version>
     <description>VMSHIPMENT_RULES_DESC</description>
     <files>
         <filename plugin="rules_shipping">rules_shipping.php</filename>
diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php
index 23142a01c5c0a3efbbcb6acc8eecfd27b77982f0..a8487a6ed32cb44eee57e29d572e52a63074435b 100644
--- a/rules_shipping_advanced.php
+++ b/rules_shipping_advanced.php
@@ -60,12 +60,12 @@ class plgVmShipmentRules_Shipping_Advanced extends plgVmShipmentRules_Shipping_B
 	}
 	/** Allow child classes to add additional variables for the rules 
 	 */
-	protected function addCustomCartValues (VirtueMartCart $cart, $cart_prices, &$values) {
+	protected function addCustomCartValues (VirtueMartCart $cart, $products, $cart_prices, &$values) {
 		$values['coupon'] = $cart->couponCode;
 
 		// Postal code Check for UK postal codes: Use regexp to determine if ZIP structure matches and also to extract the parts.
 		// Also handle UK overseas areas/islands that use four-letter outward codes rather than "A{1,2}0{1,2}A{0,1} 0AA"
-		if ($values['zip']) {
+		if (isset($values['zip'])) {
 			$zip=strtoupper($values['zip']);
 		}
 		if (isset($zip) and preg_match('/^\s*(([A-Z]{1,2})(\d{1,2})([A-Z]?)|[A-Z]{4}|GIR)\s*(\d[A-Z]{2})\s*$/', $zip, $match)) {
diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml
index da42f065ddcb682c8676e56969d3ee51cc8674ee..4c2102871f232b9fc7d4e7e5a78b49b779deba3d 100644
--- a/rules_shipping_advanced.xml
+++ b/rules_shipping_advanced.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>4.99</version>
+    <version>4.99a</version>
     <description>VMSHIPMENT_RULES_ADV_DESC</description>
     <files>
         <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>