diff --git a/readme.txt b/readme.txt
index 9594bf7..a9dfc99 100644
--- a/readme.txt
+++ b/readme.txt
@@ -37,6 +37,9 @@ View our full installation guide: <https://docs.paymentwall.com/modules/woocomme
 
 == Changelog ==
 
+= v1.8.1 [04/07/2022] =
+* Fix duplicated charge for Brick 1.6
+
 = v1.8.0 [21/09/2021] =
 * Upgrade brick version from 1.4 to 1.6
 
diff --git a/src/paymentwall-for-woocommerce.php b/src/paymentwall-for-woocommerce.php
index 1276040..86b27e2 100644
--- a/src/paymentwall-for-woocommerce.php
+++ b/src/paymentwall-for-woocommerce.php
@@ -5,7 +5,7 @@
  * Plugin Name: Paymentwall for WooCommerce
  * Plugin URI: https://docs.paymentwall.com/modules/woocommerce
  * Description: Official Paymentwall module for WordPress WooCommerce.
- * Version: 1.8.0
+ * Version: 1.8.1
  * Author: The Paymentwall Team
  * Author URI: http://www.paymentwall.com/
  * Text Domain: paymentwall-for-woocommerce
diff --git a/src/templates/brick/form.html b/src/templates/brick/form.html
index 59fa21b..973efe2 100644
--- a/src/templates/brick/form.html
+++ b/src/templates/brick/form.html
@@ -17,7 +17,9 @@
             return true;
         });
 
-        $(document.body).on('checkout_error', function () {
+        $(document.body).unbind('checkout_error').on('checkout_error', handlePreValidation)
+        
+        function handlePreValidation() {
             var error_count = $('.woocommerce-error li').length;
             $('.woocommerce-error').css('display', 'block');
 
@@ -50,7 +52,7 @@
                     }
                 });
             }
-        });
+        }
 
         if (haveToken && !$('#wc-brick-payment-token-new').is(':checked')) {
             $('#brick-form-payment').hide()