Fix the failure from every other api call