diff --git a/Classes/Package.php b/Classes/Package.php
index b4026d1..d687e92 100644
--- a/Classes/Package.php
+++ b/Classes/Package.php
@@ -31,8 +31,7 @@ class Package extends BasePackage
 
         $dispatcher = $bootstrap->getSignalSlotDispatcher();
         $dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady',
-            function ($configurationManager) {
-                /* @var ConfigurationManager $configurationManager */
+            function (ConfigurationManager $configurationManager) {
                 $configurationManager->registerConfigurationType(
                     static::CONFIGURATION_TYPE_VALIDATION,
                     ConfigurationManager::CONFIGURATION_PROCESSING_TYPE_DEFAULT,
diff --git a/Classes/Validation/Validator/SettingsValidator.php b/Classes/Validation/Validator/SettingsValidator.php
index 563ffe9..b862e21 100644
--- a/Classes/Validation/Validator/SettingsValidator.php
+++ b/Classes/Validation/Validator/SettingsValidator.php
@@ -126,7 +126,7 @@ class SettingsValidator extends AbstractValidator
     }
 
     /**
-     * @param $name
+     * @param string $name
      *
      * @return array
      */
diff --git a/Migrations/Code/Version20170603120900.php b/Migrations/Code/Version20170603120900.php
index 333c1a5..33318b6 100644
--- a/Migrations/Code/Version20170603120900.php
+++ b/Migrations/Code/Version20170603120900.php
@@ -28,15 +28,20 @@ class Version20170603120900 extends AbstractMigration
      */
     public function up()
     {
-        $this->processConfiguration(Package::CONFIGURATION_TYPE_VALIDATION,
+        $this->processConfiguration(
+            Package::CONFIGURATION_TYPE_VALIDATION,
             function (&$configuration) {
                 foreach ($configuration as $validatorName => &$validators) {
+                    // guard that protects configuration, which has already the new format:
+                    if (isset($validators['properties']) || isset($validators['self'])) {
+                        continue;
+                    }
                     $newConfiguration = ['properties' => [], 'self' => []];
 
                     foreach ($validators as $key => &$validator) {
-                        if (!isset($validator['validator']) || !isset($validator['options'])) {
+                        if (! isset($validator['validator']) || ! isset($validator['options'])) {
                             $this->showWarning('The Validation.yaml files contained no validator or options for ' .
-                                'validation: "' . $validatorName . '.' . $key . '". It was not be migrated.');
+                                'validation: "' . $validatorName . '.' . $key . '". It was not migrated.');
                             continue;
                         }
                         if (isset($validator['property'])) {
diff --git a/Tests/Functional/Fixtures/TestObject.php b/Tests/Functional/Fixtures/TestObject.php
index ddd62c5..b91587a 100644
--- a/Tests/Functional/Fixtures/TestObject.php
+++ b/Tests/Functional/Fixtures/TestObject.php
@@ -16,7 +16,7 @@ class TestObject
     protected $shouldBeFalse = true;
 
     /**
-     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "TrueValidator"})
+     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name"="TrueValidator"})
      * @var bool
      */
     protected $shouldBeTrueAndValidatedByAnnotation = false;