Fixing Autodetect extends.