Fix possible mistargeting.