diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index a546210ce..63de2eb21 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -38,7 +38,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
     }
 
     public function getOrder() {
-        return 30;
+        return 51;
     }
 
 
@@ -73,8 +73,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
             LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
         ));
 
-        $ar->setMunicipalityCode($ar->getPostcode());
-        dump($ar);
+        $ar->setMunicipalityCode($ar->getPostcode()->getCode());
 
         return $ar
         ;
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index d7a0e0156..944cab81b 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -103,18 +103,30 @@ class AddressReference
         return $this;
     }
 
-    public function getPostcode(): ?string
-    {
-        return $this->postcode;
-    }
-
-    public function setPostcode(?string $postcode): self
+    /**
+     * Set postcode
+     *
+     * @param PostalCode $postcode
+     *
+     * @return Address
+     */
+    public function setPostcode(PostalCode $postcode = null)
     {
         $this->postcode = $postcode;
 
         return $this;
     }
 
+    /**
+     * Get postcode
+     *
+     * @return PostalCode
+     */
+    public function getPostcode()
+    {
+        return $this->postcode;
+    }
+
     public function getMunicipalityCode(): ?string
     {
         return $this->municipalityCode;