Fixed bug with loading data