diff -r 799466384604 -r 560075ece524 absyntax_utils/function_call_param_iterator.cc
--- a/absyntax_utils/function_call_param_iterator.cc	Wed Jun 16 21:52:17 2010 +0200
+++ b/absyntax_utils/function_call_param_iterator.cc	Sat Mar 12 18:31:36 2011 +0100
@@ -495,8 +495,10 @@
   /* If the syntax parser is working correctly, exactly one of the 
    * following two symbols will be NULL, while the other is != NULL.
    */
-  if (symbol->   formal_param_list != NULL) return symbol->   formal_param_list->accept(*this);
-  if (symbol->nonformal_param_list != NULL) return symbol->nonformal_param_list->accept(*this);
+  if (symbol == (function_invocation_c *)f_call) {
+	if (symbol->   formal_param_list != NULL) return symbol->   formal_param_list->accept(*this);
+    if (symbol->nonformal_param_list != NULL) return symbol->nonformal_param_list->accept(*this);
+  }
 
   return NULL;
 }