Fix collateral damage
Fix collateral damage

[complete #105609780]
fujitsu-cf/cli,fujitsu-cf/cli,simonleung8/cli,hyenaspots/cli,simonleung8/cli,markstgodard/cli,fujitsu-cf/cli,mcintyred/cli,markstgodard/cli,markstgodard/cli,markstgodard/cli,mcintyred/cli,hyenaspots/cli,simonleung8/cli,mcintyred/cli,mcintyred/cli,hyenaspots/cli,hyenaspots/cli