Fix for Tree