Your solutions technically work but this "feature" adds nothing to the game outside of combat other than add annoyance of it happening or dealing with it. Absolutely stupid.