Data loading fix