Fixed #22833: Autodetector not doing through mapping correctly