Fixing a problem with incorrect hardware detection