remove a state when attacked, even if evaded?

[jonthefox]

I have a skill called "dodge" - 100% evasion for the next physical attack.   I do this by giving a "dodge" state to the user, and I've also set every physical attack to remove the "dodge" state.  The problem is that when the attack is dodged, the state doesn't actually get removed, so the user ends up with the buff for the entire turn even if he's attacked by multiple enemies.   

Short of manually removing the state in every single skill damage formula (am guessing this is possible but not practical), is there a way to accomplish this?  Thank you in advance.

 

[Farlans]

A different way to do it would be that your "dodge" state give the character Element rate: Physical 0%
He would not be dodging it, but instead he would receive 0 damage from it.

And then, once he's hitted the state is removed.