artf676839: BT Bug fixing