Fix the function calls