diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index 4e80760f3..2bbab4042 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -200,6 +200,7 @@ class ObjectHydrator extends AbstractHydrator
                         foreach ($assoc->targetToSourceKeyColumns as $srcColumn) {
                             $joinColumns[$srcColumn] = $data[$assoc->joinColumnFieldNames[$srcColumn]];
                         }
+                        //TODO: If its in the identity map just get it from there if possible!
                         if ($assoc->isLazilyFetched() /*&& ! $assoc->isOptional*/) {
                             // Inject proxy
                             $proxy = $this->_proxyFactory->getAssociationProxy($entity, $assoc, $joinColumns);
diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
index 72187afdd..3e7bb9e02 100644
--- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
+++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
@@ -42,6 +42,10 @@ class CmsAddress
     public function getId() {
         return $this->id;
     }
+    
+    public function getUser() {
+        return $this->user;
+    }
 
     public function getCountry() {
         return $this->country;
diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
index e20545861..f4a016717 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
@@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
+use Doctrine\Tests\Models\CMS\CmsAddress;
 
 require_once __DIR__ . '/../../TestInit.php';
 
@@ -50,7 +51,7 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals('Roman', $users[0]->name);
     }
     
-    public function testJoinedNativeQuery()
+    public function testJoinedOneToManyNativeQuery()
     {
         $user = new CmsUser;
         $user->name = 'Roman';
@@ -83,11 +84,61 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertTrue($users[0] instanceof CmsUser);
         $this->assertEquals('Roman', $users[0]->name);
         $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection);
+        $this->assertTrue($users[0]->getPhonenumbers()->isInitialized());
         $this->assertEquals(1, count($users[0]->getPhonenumbers()));
         $phones = $users[0]->getPhonenumbers();
         $this->assertEquals(424242, $phones[0]->phonenumber);
         $this->assertTrue($phones[0]->getUser() === $users[0]);
         
     }
+    
+    public function testJoinedOneToOneNativeQuery()
+    {
+        $user = new CmsUser;
+        $user->name = 'Roman';
+        $user->username = 'romanb';
+        $user->status = 'dev';
+        
+        $addr = new CmsAddress;
+        $addr->country = 'germany';
+        $addr->zip = 10827;
+        $addr->city = 'Berlin';
+        
+        
+        $user->setAddress($addr);
+        
+        $this->_em->persist($user);
+        $this->_em->flush();
+        
+        $this->_em->clear();
+        
+        
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+        $rsm->addFieldResult('u', 'id', 'id');
+        $rsm->addFieldResult('u', 'name', 'name');
+        $rsm->addFieldResult('u', 'status', 'status');
+        $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address');
+        $rsm->addFieldResult('a', 'a_id', 'id');
+        $rsm->addFieldResult('a', 'country', 'country');
+        $rsm->addFieldResult('a', 'zip', 'zip');
+        $rsm->addFieldResult('a', 'city', 'city');
+        
+        $query = $this->_em->createNativeQuery('SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm);
+        $query->setParameter(1, 'romanb');
+        
+        $users = $query->getResult();
+        
+        $this->assertEquals(1, count($users));
+        $this->assertTrue($users[0] instanceof CmsUser);
+        $this->assertEquals('Roman', $users[0]->name);
+        $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection);
+        $this->assertFalse($users[0]->getPhonenumbers()->isInitialized());
+        $this->assertTrue($users[0]->getAddress() instanceof CmsAddress);
+        $this->assertTrue($users[0]->getAddress()->getUser() == $users[0]);
+        $this->assertEquals('germany', $users[0]->getAddress()->getCountry());
+        $this->assertEquals(10827, $users[0]->getAddress()->getZipCode());
+        $this->assertEquals('Berlin', $users[0]->getAddress()->getCity());
+    }
 }