fixing Data fetching