Fix a bit
Merge branch 'origin/BT'