fixed data loading