fix data fetch