BL-Ctrl 3.0 fix