diff --git a/Makefile b/Makefile
index fc6be2dc767260dd0dadb85b54abc5f0c3e733db..0b5ecaba9869efcae4e61a30852a54aaec1fae2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 BASE=shipping-by-rules
 PLATTFORM=woocommerce
 VENDOR=opentools
-VERSION=1.2.2
+VERSION=1.2.3
 DIR = $(shell pwd)
 SVNDIR=wordpress-plugin-svn
 
diff --git a/readme-adv.txt b/readme-adv.txt
index 9834db841231600bd2d9f68ab16b1ce4a28fe857..4f0b51d77819287180e28f824f9da29a28af6bc0 100644
--- a/readme-adv.txt
+++ b/readme-adv.txt
@@ -3,7 +3,7 @@ Contributors: opentools
 Tags: WooCommerce, Shipment, Shipping
 Requires at least: 4.0
 Tested up to: 4.5
-Stable tag: 1.2.2
+Stable tag: 1.2.3
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl.html
 
diff --git a/readme.txt b/readme.txt
index 4c33bd3c4158c4af12f6f47a26d408ce7e224e9e..1ed28694e7c0aef37bd3b05df3cff00dc1006d25 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: opentools
 Tags: WooCommerce, Shipment, Shipping, Rules shipping
 Requires at least: 4.0
 Tested up to: 4.5
-Stable tag: 1.2.2
+Stable tag: 1.2.3
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl.html
 
@@ -69,6 +69,11 @@ Please see our support forum at http://open-tools.net/forum/. It might also be a
 
 == Changelog ==
 
+= 1.2.3 =
+* Fix update credentials input 
+* Fix PHP error when both versions of the plugin are enabled
+* Fix fatal error:  Call to a member function isNoShipping() on a non-object...
+
 = 1.2.2 =
 * Fix warning about function signature mismatch
 * Fix Coupons variable not being available (advanced version)
diff --git a/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.3.zip b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.3.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9642998e1a2c0d720c2fa491826a497b4cc4614a
Binary files /dev/null and b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.2.3.zip differ
diff --git a/releases/opentools-woocommerce-shipping-by-rules_v1.2.3.zip b/releases/opentools-woocommerce-shipping-by-rules_v1.2.3.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9cc8b31039e13659a492113a9d3e20a02034b2de
Binary files /dev/null and b/releases/opentools-woocommerce-shipping-by-rules_v1.2.3.zip differ
diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php
index 125fb2be7212cce55a1163ac9f082d1ea71d6086..a8c708fc310f8907e00116b9dafcf71e472bf758 100644
--- a/woocommerce-advanced-shipping-by-rules.php
+++ b/woocommerce-advanced-shipping-by-rules.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Advanced Shipping By Rules
  * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
  * Description: Define Shipping cost by very general and flexible (text-based) rules. The advanced version also provides mathematical expressions and functions
- * Version: 1.2.2
+ * Version: 1.2.3
  * Author: Open Tools, Reinhold Kainhofer
  * Author URI: http://open-tools.net
  * Text Domain: woocommerce-advanced-shipping-by-rules
@@ -75,7 +75,7 @@ class WooCommerce_Shipping_By_Rules_Advanced {
 	 * @since 1.0.0
 	 * @var string $version Plugin version number.
 	 */
-	public $version = '1.2.2';
+	public $version = '1.2.3';
 
 
 	/**
diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php
index 2eff9143f30f12772efd2bd2d189ee0e6580d2bd..e332632e9049f1871765841740b1f325187a7638 100644
--- a/woocommerce-shipping-by-rules.php
+++ b/woocommerce-shipping-by-rules.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Shipping By Rules
  * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
  * Description: Define Shipping cost by very general and flexible (text-based) rules.
- * Version: 1.2.2
+ * Version: 1.2.3
  * Author: Open Tools, Reinhold Kainhofer
  * Author URI: http://open-tools.net
  * Text Domain: woocommerce-shipping-by-rules
@@ -48,7 +48,7 @@ class WooCommerce_Shipping_By_Rules {
 	 * @since 1.0.0
 	 * @var string $version Plugin version number.
 	 */
-	public $version = '1.2.2';
+	public $version = '1.2.3';
 
 
 	/**