diff --git a/src/PHPCR/Util/QOM/Sql2Generator.php b/src/PHPCR/Util/QOM/Sql2Generator.php
index 49e1ecdb..13d9b5d4 100644
--- a/src/PHPCR/Util/QOM/Sql2Generator.php
+++ b/src/PHPCR/Util/QOM/Sql2Generator.php
@@ -325,7 +325,7 @@ public function evalPath($path)
             $sql2 = $path;
             // only ensure proper quoting if the user did not quote himself, we trust him to get it right if he did.
             if (substr($path, 0,1) !== '[' && substr($path, -1) !== ']') {
-                if (false !== strpos($sql2, ' ')) {
+                if (false !== strpos($sql2, ' ') || false !== strpos($sql2, '.')) {
                     $sql2 = '"' . $sql2 . '"';
                 }
                 $sql2 = '[' . $sql2 . ']';