Subtree propagation of scrunitizer fix