fix api_calls