bugs fixed funccall resolver