Fixed autoloading bug