Bugfix for loading