BL-Ctrl 3.0 fix
Merge pull request #677 from NosDE/master

BL-Ctrl 3.0 fix