diff --git a/README.md b/README.md
index 4aef583..473064d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository contains the OpenCart  wallee payment module that enables the sh
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.1/1.0.49/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.1/1.0.50/docs/en/documentation.html)
 
 ## Support
 
@@ -21,4 +21,4 @@ Support queries can be issued on the [wallee support site](https://app-wallee.co
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.1/blob/1.0.49/LICENSE) for more information.
\ No newline at end of file
+Please see the [license file](https://github.com/wallee-payment/opencart-2.1/blob/1.0.50/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index bf82c19..91ab678 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/opencart-2.1/releases/tag/1.0.49/">
+		<a href="https://github.com/wallee-payment/opencart-2.1/releases/tag/1.0.50/">
 			Source
 		</a>
 	</li>
@@ -49,7 +49,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.1/releases/tag/1.0.49/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.1/releases/tag/1.0.50/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>
diff --git a/upload/admin/view/template/payment/wallee.tpl b/upload/admin/view/template/payment/wallee.tpl
index 8cf76c3..453f7e7 100644
--- a/upload/admin/view/template/payment/wallee.tpl
+++ b/upload/admin/view/template/payment/wallee.tpl
@@ -257,14 +257,14 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><?php echo $entry_version; ?></label>
 							<div class="col-sm-10">
-								<p class="form-control-static">1.0.49</p>
+								<p class="form-control-static">1.0.50</p>
 							</div>
 						</div>
 	
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><?php echo $entry_date; ?></label>
 							<div class="col-sm-10">
-								<p class="form-control-static">2022/08/11 13:03:33</p>
+								<p class="form-control-static">2022/09/01 12:37:41</p>
 							</div>
 						</div>
 					</fieldset>
diff --git a/upload/system/library/wallee/service/transaction.php b/upload/system/library/wallee/service/transaction.php
index ed8662e..f2ba879 100644
--- a/upload/system/library/wallee/service/transaction.php
+++ b/upload/system/library/wallee/service/transaction.php
@@ -488,25 +488,25 @@ private function assembleAddress($source, $prefix = ''){
 		$address = new \Wallee\Sdk\Model\AddressCreate();
 		
 		if (isset($source[$prefix . 'city'])) {
-			$address->setCity($this->getFixedSource($source, $prefix . 'city', 100));
+			$address->setCity($this->getFixedSource($source, $prefix . 'city', 100, false));
 		}
 		if (isset($source[$prefix . 'iso_code_2'])) {
 			$address->setCountry($source[$prefix . 'iso_code_2']);
 		}
 		if (isset($source[$prefix . 'lastname'])) {
-			$address->setFamilyName($this->getFixedSource($source, $prefix . 'lastname', 100));
+			$address->setFamilyName($this->getFixedSource($source, $prefix . 'lastname', 100, false));
 		}
 		if (isset($source[$prefix . 'firstname'])) {
-			$address->setGivenName($this->getFixedSource($source, $prefix . 'firstname', 100));
+			$address->setGivenName($this->getFixedSource($source, $prefix . 'firstname', 100, false));
 		}
 		if (isset($source[$prefix . 'company'])) {
-			$address->setOrganizationName($this->getFixedSource($source, $prefix . 'company', 100));
+			$address->setOrganizationName($this->getFixedSource($source, $prefix . 'company', 100, false));
 		}
 		if (isset($source[$prefix . 'postcode'])) {
 			$address->setPostCode($this->getFixedSource($source, $prefix . 'postcode', 40));
 		}
 		if (isset($source[$prefix . 'address_1'])) {
-			$address->setStreet($this->fixLength(trim($source[$prefix . 'address_1'] . "\n" . $source[$prefix . 'address_2']), 300));
+			$address->setStreet($this->fixLength(trim($source[$prefix . 'address_1'] . "\n" . $source[$prefix . 'address_2']), 300, false));
 		}
 		
 		// state is 2-part