diff --git a/DataStorage/Database/GrammarAbstract.php b/DataStorage/Database/GrammarAbstract.php
index 4f6e6845c..62e3bcd42 100644
--- a/DataStorage/Database/GrammarAbstract.php
+++ b/DataStorage/Database/GrammarAbstract.php
@@ -285,7 +285,7 @@ abstract class GrammarAbstract
         $fullSystem = '';
 
         foreach ($split as $key => $system) {
-            $fullSystem .= '.' . $identifier . ($key === 0 ? $prefix : '') . $system . $identifier;
+            $fullSystem .= '.' . ($system !== '*' ? $identifier : '') . ($key === 0 && $system !== '*' ? $prefix : '') . $system . ($system !== '*' ? $identifier : '');
         }
 
         return \ltrim($fullSystem, '.');
diff --git a/Localization/Localization.php b/Localization/Localization.php
index 8a4d9128d..d7b94a6ae 100644
--- a/Localization/Localization.php
+++ b/Localization/Localization.php
@@ -160,7 +160,7 @@ final class Localization
         $files = \glob(__DIR__ . '/../Localization/Defaults/Definitions/' . $langCode . '_' . $countryCode);
 
         foreach ($files as $file) {
-            $fileContent = \file_get_contents(__DIR__ . '/../Localization/Defaults/Definitions/' . $file);
+            $fileContent = \file_get_contents($file);
 
             if ($fileContent === false) {
                 break;