full bt fix

Merge it.