fix trees in 40.X