Fix bug with BB