Tree build fix