Bugfix for loading data