Fix expand tree