Fixed autoloading problem