Fixing data loading bug