Fix to customer data loading