autoload and bug correction