--- a/server/msplanner.py	Thu Mar 25 20:32:10 2010 +0100
+++ b/server/msplanner.py	Fri Mar 26 16:15:16 2010 +0100
@@ -315,8 +315,8 @@
                 for const in rel.children[1].get_nodes(Constant):
                     eid = const.eval(self.plan.args)
                     source = self._session.source_from_eid(eid)
-                    if vrels and not any(source.support_relation(r.r_type)
-                                         for r in vrels if not r is rel):
+                    if not any(source.support_relation(r.r_type)
+                               for r in varobj.stinfo['relations'] if not r is rel):
                         self._set_source_for_term(self.system_source, varobj)
                     else:
                         self._set_source_for_term(source, varobj)