Short fix for autoloading