Fix data retrieving