diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php
index f19f29e03..1505ea29f 100644
--- a/core/lib/Thelia/Model/Order.php
+++ b/core/lib/Thelia/Model/Order.php
@@ -10,13 +10,48 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Order as BaseOrder;
 use Thelia\Model\Base\OrderProductTaxQuery;
 use Thelia\Model\Map\OrderProductTaxTableMap;
+use Thelia\Model\Tools\ModelEventDispatcherTrait;
 
 class Order extends BaseOrder
 {
-    use \Thelia\Model\Tools\ModelEventDispatcherTrait;
+    use ModelEventDispatcherTrait;
 
-    public $chosenDeliveryAddress = null;
-    public $chosenInvoiceAddress = null;
+    protected $choosenDeliveryAddress = null;
+    protected $choosenInvoiceAddress = null;
+
+    /**
+     * @param null $choosenDeliveryAddress
+     */
+    public function setChoosenDeliveryAddress($choosenDeliveryAddress)
+    {
+        $this->choosenDeliveryAddress = $choosenDeliveryAddress;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getChoosenDeliveryAddress()
+    {
+        return $this->choosenDeliveryAddress;
+    }
+
+    /**
+     * @param null $choosenInvoiceAddress
+     */
+    public function setChoosenInvoiceAddress($choosenInvoiceAddress)
+    {
+        $this->choosenInvoiceAddress = $choosenInvoiceAddress;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getChoosenInvoiceAddress()
+    {
+        return $this->choosenInvoiceAddress;
+    }
 
     /**
      * {@inheritDoc}