Bluetooth fix from rbraken