fixing data loading