Finally fixed data loading