Play nice with regular tree, fix #1