#50 fix for both OL and BL