Tree behavior fix