Fixed autoload for real