Fix vartree expand