fix fetching