The trespassing grievance an easy way to farm war support

Recently I’ve been playing some base game humankind and have noticed that the trespassing grievance can help give enough war support to restart a war only a few turns after it ended. In my experience this happens when you have units in enemy territory after you have declared peace and you can’t move them back into your own territory the same turn. On the next turn this creates a grievance for your opponent which gives you some war support. With enough armies this can generate significant war support with little to no risk. This makes it very easy to chain war a already weakened opponent. 

This is even worse when enemy units are in conquered territory giving you grievances that you can trigger your initiative. I’ve also seen the AI can do this and found it hard to prevent them doing it. Since I didn’t play with the Together We Rule Expansion, I don’t know how it would affect this exploit.

I think that an easily implemented solution to this could be to give this grievance a cool down for a few turns after peace. Thereby allowing units to return to their own territory.