update loader infrastructure
bugfix