- Fixed bug in interm relation.

- Commented flag for normal version.

src/arachne.c

@@ -547,8 +547,8 @@ select_goal ()
       b = (Binding) bl->data;
       if (!b->done)
 	{
-	  // We don't care about singular variables, so...
-	  if (!isTermVariable (b->term))
+	  // We don't care about singular agent variables, so...
+	  if (! (isTermVariable (b->term) && inTermlist (b->term->stype, TERM_Agent)))
 	    {
 	      float cons;
 
@@ -1029,10 +1029,12 @@ iterate ()
 #endif
   indentDepth--;
 
-  if (!flag)
+#ifdef DEBUG
+  if (DEBUGL (5) && !flag)
     {
       warning ("Flag has turned 0!");
     }
+#endif
   return flag;
 }
 

src/binding.c

@@ -372,7 +372,7 @@ bindings_c_minimal ()
 		      Roledef rd;
 
 		      rd = roledef_shift (sys->runs[run].start, ev);
-		      if (termInTerm (b->term, rd->message))
+		      if (termInTerm (rd->message, b->term))
 			{
 			  // This term already occurs as interm in a previous node!
 			  return 0;