Fixed autoloading hopefully for the last time