found more cases for BT and fix pull 2299