Villagers auto aggro to elephants/rhinos when attacked

Hello everyone,

​

For some reason my vils turn back start fighting elephants and rhinos AFTER I right click them back to the TC when luring boar. Strangely this does not happen with boars, but with elephants and rhinos. I've just lost 2 vils and resigned at 5 mins in a ranked game because of that. One of the vils shot the rhino once, I clicked her back to safety, she turned back and started fighting when rhino attacked her, I right clicked to save her again, and she AGAIN turned back and started fighting the rhino when rhino hit her again. It's really annoying when your units don't listen to your commands. I know this has been in the game for a while now but it felt like the chances of it happening increased in the last patch. Also, am I the only one who encounters this more often with rhinos/elephants compared to the regular boars? I'm not an expert and my APM isn't that high either, I just want to click my vils back to the safety and continue with the build order before forgetting where will the next vil go.