bbu bug fix