diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 65142e84c..50852ac36 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1444,10 +1444,11 @@ class UnitOfWork implements PropertyChangedListener
                     }
                 }
                 if ($class->isChangeTrackingNotify()) {
-                    //TODO: put changed fields in changeset...?
+                    // Just treat all properties as changed, there is no other choice.
+                    $this->propertyChanged($managedCopy, $name, null, $prop->getValue($managedCopy));
                 }
             }
-            if ( ! $class->isChangeTrackingDeferredImplicit()) {
+            if ($class->isChangeTrackingDeferredExplicit()) {
                 $this->scheduleForDirtyCheck($entity);
             }
         }