Mercenary AI with headhunter

Can we get a fix on this? it's happening on almost every map
For those who don't know, when a mercenary steals a certain mod with headhunter it's AI goes crazy and makes them run away nonstop, this can be "fixed" by going back to hideout but let's be real, a mandatory portal per map because of AI glitches shouldn't be a thing