fix for BBB