fix 23-tree by avoiding variable name clash