I think I fixed the fetching issue