Get around data loading async issue