Fix bubble_hierachy so it works out of the box