Fixed issue where data was not being loaded properly.