diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3dfa21..29403ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v4.1.7
+* Fixed notices in ICML generation and while setting delivery type
+* Fixed incorrect data check before setting payment data
+* Some other minor improvements
+
 ## v4.1.6
 * Fix for typo in the history routine
 * Fix for incorrect protocol in the ICML product image links
diff --git a/VERSION b/VERSION
index 561ad33..9edf2a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.6
+4.1.7
diff --git a/src/upload/system/library/retailcrm/lib/service/OrderManager.php b/src/upload/system/library/retailcrm/lib/service/OrderManager.php
index fe80f76..52aca33 100644
--- a/src/upload/system/library/retailcrm/lib/service/OrderManager.php
+++ b/src/upload/system/library/retailcrm/lib/service/OrderManager.php
@@ -155,7 +155,7 @@ class OrderManager {
         }
 
         foreach ($order_info['payments'] as $payment_data) {
-            if (isset($payment_data['externalId']) && $payment_data['externalId'] == $orderId) {
+            if (isset($payment_data['externalId'])) {
                 $payment = $payment_data;
             }
         }