fix for data loading