Fix to autoloader