diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index be1cd2ed0ff..ffeee6df656 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -83,12 +83,12 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
 
             // Split schema and table name from a table name like "myschema.mytable"
             if (strpos($tableName, '.') !== false) {
-                list($schemaName, $tableName) = explode('.', $tableName);
+                list($table['schema'], $tableName) = explode('.', $tableName, 2);
             }
         }
 
         if (isset($element['schema'])) {
-            $schemaName = $element['schema'];
+            $table['schema'] = $element['schema'];
         }
 
         if (null !== $tableName) {