Fixed autoloading!