BTM

Fix for BTM-33 leads to another problem