diff --git a/DataStorage/File/JsonBuilder.php b/DataStorage/File/JsonBuilder.php
index 25961948f..2123f2020 100644
--- a/DataStorage/File/JsonBuilder.php
+++ b/DataStorage/File/JsonBuilder.php
@@ -15,6 +15,7 @@ declare(strict_types=1);
 namespace phpOMS\DataStorage\File;
 
 use phpOMS\DataStorage\File\QueryType;
+use phpOMS\DataStorage\Database\Query\JoinType;
 
 /**
  * Json query Jsonbuilder.
diff --git a/DataStorage/File/JsonGrammar.php b/DataStorage/File/JsonGrammar.php
index f34697c32..00ce90215 100644
--- a/DataStorage/File/JsonGrammar.php
+++ b/DataStorage/File/JsonGrammar.php
@@ -2,4 +2,34 @@
 // where create sub array
 // order
 // select data from where
-// limit
\ No newline at end of file
+// limit
+
+/**
+ * Orange Management
+ *
+ * PHP Version 7.2
+ *
+ * @package    phpOMS\DataStorage\File
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+declare(strict_types=1);
+
+namespace phpOMS\DataStorage\File;
+
+use phpOMS\DataStorage\File\QueryType;
+
+/**
+ * Json query JsonGrammar.
+ *
+ * @package    phpOMS\DataStorage\File
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
+ * @since      1.0.0
+ */
+final class JsonGrammar
+{
+
+}
diff --git a/Math/Matrix/SingularValueDecomposition.php b/Math/Matrix/SingularValueDecomposition.php
index 8474efce9..14fcd3937 100644
--- a/Math/Matrix/SingularValueDecomposition.php
+++ b/Math/Matrix/SingularValueDecomposition.php
@@ -254,13 +254,11 @@ final class SingularValueDecomposition
         $pp   = $p - 1;
         $iter = 0;
 
-        while (true) {
+        while ($p > 0) {
             for ($k = $p - 2; $k >= -1; --$k) {
                 if ($k === -1) {
                     break;
-                }
-
-                if (\abs($e[$k]) <= $eps * (\abs($this->S[$k]) + \abs($this->S[$k + 1]))) {
+                } elseif (\abs($e[$k]) <= $eps * (\abs($this->S[$k]) + \abs($this->S[$k + 1]))) {
                     $e[$k] = 0.0;
                     break;
                 }
diff --git a/Message/RequestAbstract.php b/Message/RequestAbstract.php
index 2d5582e56..f01b32079 100644
--- a/Message/RequestAbstract.php
+++ b/Message/RequestAbstract.php
@@ -196,7 +196,7 @@ abstract class RequestAbstract implements MessageInterface
             return [];
         }
 
-        $json = \json_decode($this->data[$key]);
+        $json = \json_decode($this->data[$key], true);
 
         return $json === false ? [] : $json;
     }