temp bb-up fix

Thanks @tdhite for the pointer

TODO  Make Better.

Change-Id: I2c52c1261d62c07397c194313821ed1b1a61714f