diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 78534b268..70e181a40 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -112,7 +112,7 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         // Reset postage cost if the delivery module had been removed
         if ($deliveryModuleId <= 0) {
-            $this->setPostage(0);
+            $order->setPostage(0);
         }
 
         $event->setOrder($order);
diff --git a/templates/backOffice/default/assets/img/flags/TES.png b/templates/backOffice/default/assets/img/flags/TES.png
new file mode 100644
index 000000000..9d91c7f4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/TES.png differ
diff --git a/templates/backOffice/default/assets/img/flags/TEST.png b/templates/backOffice/default/assets/img/flags/TEST.png
new file mode 100644
index 000000000..9d91c7f4b
Binary files /dev/null and b/templates/backOffice/default/assets/img/flags/TEST.png differ
diff --git a/web/.htaccess b/web/.htaccess
index dfe03bf51..9bbc5928b 100755
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -7,7 +7,7 @@ AddDefaultCharset UTF-8
 
     # If thelia is installed in a subdirectory (e.g., thelia2)
     # define the RewriteBase below to get a proper URL rewriting
-    # RewriteBase /thelia2
+    RewriteBase /thelia2
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d