Fix tree  breakage from 539a72516241d4c1bcbbb31e54efa642f5b3b98e.