Yep I do agree.

If my memory don't fail me, you also lose the buff on KO.
And you can't target your allies to prepare your buff.

Those two should be fixed.