diff -r 2d0aa2b7da02 -r 4f12f59b1a13 entity.py
--- a/entity.py	Thu Mar 04 17:58:31 2010 +0100
+++ b/entity.py	Thu Mar 04 18:02:33 2010 +0100
@@ -876,7 +876,6 @@
         _done.add(self.eid)
         containers = tuple(self.e_schema.fulltext_containers())
         if containers:
-            yielded = False
             for rschema, target in containers:
                 if target == 'object':
                     targets = getattr(self, rschema.type)
@@ -888,8 +887,6 @@
                     for container in entity.fti_containers(_done):
                         yield container
                         yielded = True
-            if not yielded:
-                yield self
         else:
             yield self
 
@@ -919,7 +916,6 @@
                 continue
             if value:
                 words += tokenize(value)
-
         for rschema, role in self.e_schema.fulltext_relations():
             if role == 'subject':
                 for entity in getattr(self, rschema.type):