diff --git a/EventListener/JmsPostSerializeListener.php b/EventListener/JmsPostSerializeListener.php
index 6ee4acb..9d90ebd 100644
--- a/EventListener/JmsPostSerializeListener.php
+++ b/EventListener/JmsPostSerializeListener.php
@@ -54,7 +54,7 @@ public function onPostSerialize(ObjectEvent $event)
 
                     /** @var GenericSerializationVisitor $visitor */
                     $visitor = $event->getVisitor();
-                    $visitor->addData($virtualField, $this->serializeValue($liipAnnotation, $object, $value));
+                    $visitor->setData($virtualField, $this->serializeValue($liipAnnotation, $object, $value));
                 }
             }
         }
diff --git a/EventListener/JmsSerializeListenerAbstract.php b/EventListener/JmsSerializeListenerAbstract.php
index 4d51825..06462b3 100644
--- a/EventListener/JmsSerializeListenerAbstract.php
+++ b/EventListener/JmsSerializeListenerAbstract.php
@@ -162,7 +162,8 @@ protected function getHostUrl()
     protected function normalizeUrl($url, $normalizer)
     {
         if (array_key_exists($normalizer, $this->config) && $this->config[$normalizer]) {
-            $normalizer = new $this->config[$normalizer]();
+            $normalizerClassName = $this->config[$normalizer];
+            $normalizer = new $normalizerClassName();
             if ($normalizer instanceof UrlNormalizerInterface) {
                 $url = $normalizer->normalize($url);
             }
diff --git a/Tests/Normalizer/FilteredUrlNormalizer.php b/Tests/Normalizer/FilteredUrlNormalizer.php
index 4fb8057..8959329 100644
--- a/Tests/Normalizer/FilteredUrlNormalizer.php
+++ b/Tests/Normalizer/FilteredUrlNormalizer.php
@@ -21,7 +21,8 @@ class FilteredUrlNormalizer implements UrlNormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function normalize($url){
+    public function normalize($url)
+    {
         return str_replace('example.com', 'img.example.com', $url);
     }
 }
diff --git a/Tests/Normalizer/OriginUrlNormalizer.php b/Tests/Normalizer/OriginUrlNormalizer.php
index df279a3..772efa9 100644
--- a/Tests/Normalizer/OriginUrlNormalizer.php
+++ b/Tests/Normalizer/OriginUrlNormalizer.php
@@ -21,7 +21,8 @@ class OriginUrlNormalizer implements UrlNormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function normalize($url){
+    public function normalize($url)
+    {
         return str_replace('photo', 'newPhoto', $url);
     }
 }
diff --git a/ruleset.xml b/ruleset.xml
old mode 100755
new mode 100644