diff --git a/DataStorage/Database/GrammarAbstract.php b/DataStorage/Database/GrammarAbstract.php
index 99e0c5e47..1039e97ab 100644
--- a/DataStorage/Database/GrammarAbstract.php
+++ b/DataStorage/Database/GrammarAbstract.php
@@ -172,6 +172,10 @@ abstract class GrammarAbstract
 
         foreach ($elements as $key => $element) {
             if (is_string($element) && $element !== '*') {
+                if(strpos($element, '.')) {
+                    $prefix = '';
+                }
+
                 $expression .= $this->compileSystem($element, $prefix) . ', ';
             } elseif (is_string($element) && $element === '*') {
                 $expression .= '*, ';