Modify onDeviceFound bug