Fixing the autoloader