Adjust problem in change plans due to multi-sub changes