Correct, I see why it's a bug in changed-target-detection, and I agree that this is the right general strategy to fix it (remember the patterns the target uses to match sources)