merging over BT fix from invisiblek