Kled W Passive after cc timer bug(sometimes doesnt activate after 2nd attack )

when Kled is finishes being Crowd Controlled,after about 2-3 seconds I melee once w passive activates, then 2nd melee cancells effect not doing the bonus dmg. This is not Consistent but does happen.

Example 1: Jax stunned me, then after stun my passive activated, then 2nd attack, my AA cancelled, and passive disappeared.

Example 2: Ahiri used charmed, then after effect wore off, i went to melee her, same thing AA her twice, 3rd-4th AA cancelled, and passive disappeard.

my guess it's the passive timer is getting confused and needs to be tweaked, or just make it a toggle active that way/ every 4th attack, rather than give it a ticking cd, then it goes onto cooldown, this will help fix the timer bug it's having.