argh... never redo parts of the original patch on the fly. This fixes the tree