WL-2829 Fix for multiple tree appearances