fix for several BUs failures