Bluetooth 2.0 devices regression fix