Fix unexpand tree