Fixed the recursive BB issue