3887 - Comment tree fix