Corrected autoloader