fixed tree and drowning decorator for client