Fix data access