BT-23

Fixes BT-23