Fixing autodetect see BT#9051