Fix to api fetching