fixing autoloading