Fixed tree issue