Fix data fetching from server