Bluetooth Class bug fix