fix data fetch problem