Fixed data fetching

Fixed data fetching