--- a/devtools/fill.py	Wed Feb 12 17:32:49 2014 +0100
+++ b/devtools/fill.py	Fri Feb 14 16:10:36 2014 +0100
@@ -384,10 +384,10 @@
 
 def composite_relation(rschema):
     for obj in rschema.objects():
-        if obj.rdef(rschema, 'object').composite == 'subject':
+        if obj.rdef(rschema, 'object', takefirst=True).composite == 'subject':
             return True
     for obj in rschema.subjects():
-        if obj.rdef(rschema, 'subject').composite == 'object':
+        if obj.rdef(rschema, 'subject', takefirst=True).composite == 'object':
             return True
     return False