diff --git a/PluginInstallation/3.3.2/packlink-pro-shipping.zip b/PluginInstallation/3.3.2/packlink-pro-shipping.zip
new file mode 100644
index 0000000..ef2f096
Binary files /dev/null and b/PluginInstallation/3.3.2/packlink-pro-shipping.zip differ
diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md
index a5e8700..5daa6aa 100644
--- a/PluginInstallation/CHANGELOG.md
+++ b/PluginInstallation/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [v3.3.2](https://github.com/logeecom/pl_woocommerce_module/compare/v3.3.1...v3.3.2) - 2023-10-17
+### Changed
+- Fix the issue with drop off selection
+
 ## [v3.3.1](https://github.com/logeecom/pl_woocommerce_module/compare/v3.3.0...v3.3.1) - 2023-10-11
 ### Changed
 - Add compatibility with WooCommerce 8.1 and WordPress 6.3
diff --git a/composer.json b/composer.json
index 1bfac6b..a1889cd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "packlink/woocommerce-dev",
   "description": "Packlink WooCommerce Integration",
-  "version": "3.2.9",
+  "version": "3.3.2",
   "type": "library",
   "require": {
     "php": ">=5.5",
diff --git a/src/composer.json b/src/composer.json
index e1c98c4..d7c1b86 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "packlink/woocommerce",
   "description": "Packlink WooCommerce Integration",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "type": "library",
   "repositories": [
     {
diff --git a/src/packlink-pro-shipping.php b/src/packlink-pro-shipping.php
index 05ff87b..646c59a 100644
--- a/src/packlink-pro-shipping.php
+++ b/src/packlink-pro-shipping.php
@@ -9,7 +9,7 @@
  * Plugin Name: Packlink PRO Shipping
  * Plugin URI: https://en.wordpress.org/plugins/packlink-pro-shipping/
  * Description: Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.
- * Version: 3.3.1
+ * Version: 3.3.2
  * Author: Packlink Shipping S.L.
  * Author URI: https://pro.packlink.es/
  * License: GPL
diff --git a/src/readme.txt b/src/readme.txt
index 800dd5f..4359386 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce, shipment, shipping, packlink
 Requires at least: 4.7
 Requires PHP: 5.5
 Tested up to: 6.3.1
-Stable tag: 3.3.1
+Stable tag: 3.3.2
 License: LICENSE-2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -68,6 +68,11 @@ Click <a href="https://support-pro.packlink.com/hc/es-es/articles/210158585" tar
 
 == Changelog ==
 
+#### 3.3.2 - October 17th, 2023
+
+**Updates**
+- Fix the issue with drop off selection
+
 #### 3.3.1 - October 11th, 2023
 
 **Updates**
diff --git a/src/resources/js/packlink-checkout.js b/src/resources/js/packlink-checkout.js
index e67be99..f265856 100644
--- a/src/resources/js/packlink-checkout.js
+++ b/src/resources/js/packlink-checkout.js
@@ -102,8 +102,10 @@ var Packlink = window.Packlink || {};
 	}
 
 	function setHiddenFields(location) {
-		let dropOffId    = document.getElementsByName( 'packlink_drop_off_id' )[1];
-		let dropOffExtra = document.getElementsByName( 'packlink_drop_off_extra' )[1];
+		let dropOffId    = document.querySelector('.shop_table.woocommerce-checkout-review-order-table' +
+			' input[name="packlink_drop_off_id"]');
+		let dropOffExtra = document.querySelector('.shop_table.woocommerce-checkout-review-order-table' +
+			' input[name="packlink_drop_off_extra"]');
 
 		if (dropOffId && dropOffExtra) {
 			dropOffId.value    = location.id;