BUG: trying to fix the subtree: