Another try to repair autoloading