Fixing autoloader