_rebuild_tree order fixed