Bugfix in loader