Fix execution of functin calls