Fixed loading the data