Fixed autoloading hopefully