mbbdev - Possible fix for #933

May also be applicable to lunadev