Fix for BTN provider