Fix changed hardware detection logic