Ugh, a bug fix needed because of the bug in the CallGraph code