Fix data loading