Fix for subtree mess