fix fetching data