fixed bb bugs