diff --git a/Makefile b/Makefile
index 42509f1bea97fd718dca24df2e9ff122f63b2943..e8e341ee9d0b7887d5ab7532dd7a9b4210439bd4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=3.99
+VERSION=3.99a
 
 PLUGINFILES=$(BASE).php ordernumber_helper_joomla.php $(BASE).script.php $(BASE).xml index.html library/
 
diff --git a/fields/vmupdatecredentialscheck.php b/fields/vmupdatecredentialscheck.php
index d08397b1a162d02b78ba2551a79aa2e43957a3e4..c2424c6f8ae3ec26572702252351bbb33b8362a4 100644
--- a/fields/vmupdatecredentialscheck.php
+++ b/fields/vmupdatecredentialscheck.php
@@ -155,7 +155,6 @@ a#credentials_check {
 		if ($this->value!=1) {
 			$this->value=0;
 		}
-// 		if ($this->value==1) {
 		return "<input type='hidden' id=\"update_credentials_hidden_checked\" name='".$this->name."' value='".$this->value."' /><div class='credentials_checked credentials_checked_".$this->value."'><a href=\"#\" class=\"btn btn-info credentials_check\" id=\"credentials_check\" onclick=\"checkUpdateCredentials()\" >".JText::_('OPENTOOLS_CHECK_CREDENTIALS')."</a></div>";
 	}
 }
diff --git a/library/ordernumber_helper.php b/library/ordernumber_helper.php
index 4a9ee5e17da48b7a0a26feb6a58eb324afa19bc8..4a8b8b4fb2ef476f06952c928536fecee7064492 100644
--- a/library/ordernumber_helper.php
+++ b/library/ordernumber_helper.php
@@ -297,11 +297,14 @@ class OrdernumberHelper {
 		}
 	}
 	
+	protected function no_array($v) {
+		return !is_array($v);
+	}
 	protected function doReplacements ($fmt, $reps) {
 		// First, replace all random...[n] fields. This needs to be done with a regexp and a callback:
 		$fmt = preg_replace_callback ('/\[(random)(.*?)([0-9]*?)\]/', array($this, 'replaceRandom'), $fmt);
 		// Only use string-valued variables for replacement (array-valued variables can be used in custom variable definitions!)
-		$reps = array_filter($reps, function($v) { return !is_array($v);} );
+		$reps = array_filter($reps, array($this, "no_array") );
 		return str_ireplace (array_keys($reps), array_values($reps), $fmt);
 	}
 	
diff --git a/ordernumber.xml b/ordernumber.xml
index 3c478d735b5b92bfdbc691260db99f559f584855..255479cfa1fc65e9134948f7a6a4860203f453b3 100644
--- a/ordernumber.xml
+++ b/ordernumber.xml
@@ -7,7 +7,7 @@
     <authorUrl>http://www.open-tools.net/</authorUrl>
     <copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>3.99</version>
+    <version>3.99a</version>
     <releaseDate>2015-05-23</releaseDate>
     <releaseType>Minor update</releaseType>
     <downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl>
diff --git a/releases/plg_vmshopper_ordernumber_v3.99a.zip b/releases/plg_vmshopper_ordernumber_v3.99a.zip
new file mode 100644
index 0000000000000000000000000000000000000000..90874eabf18fe2fccc0834d6b626bf35aa9fb701
Binary files /dev/null and b/releases/plg_vmshopper_ordernumber_v3.99a.zip differ