Fixed autoloading for default case