Charged Staff with Weapon Set mechanics is BUGGED

Hello Grinding Gear Games,

In this patch we can lock one weapon to both weapon sets(locker icon).
When doing so, casting "Charged Staff" with "weapon set 2" to get buff and then using other skills with "weapon set 1" removes the buff, despite I'm using the same weapon for both weapon sets.

Why this is a bug ? Because I'm using one weapon in both weapon sets and Charged Staff Buff charges the same weapon that I'm using in both weapon sets and in this case switching between weapon sets must change only passive skill tree points not the weapon's buffs, because it's the same weapon for both weapon sets.

So now, Charged Staff BUFF programmatically is linked to weapon sets, but the description of the Charged Staff states that:

"

Consume all Power Charges to charge your Quarterstaff with electricity, adding Lightning damage and a Lightning shockwave to your Quarterstaff Attacks.

Based on this description Charged Staff BUFF must be linked to the weapon that was used to cast this spell not to a weapon set from which it was cast: it is charging "a weapon", not "a weapon set".

Please fix/change this, Charged Staff BUFF must be linked to a weapon that was used to cast this spell, not to a weapon set from which it was cast.

Thanks in advance.

Update.

Hello,
The same issue is observed with a warcry - "Ancestral Cry":
When using Ancestral Cry with weapon set II it grants a buff as usual, but when switching to weapon set I to use other skills the buff disappears.
This is illogical and frustrating, this types of buffs must be global: that is in the moment of casting/using the skill, it(skill's damage & buffs) must benefit from passives from a corresponding weapon set passives , but after, when using other skills with opposite weapon set, buffs that were granted with added benefits must be retained, otherwise skills that grant buffs just do not benefit from weapon set mechanics thus losing interaction with one of the strongest in game mechanic.

Please make such buffs to be retained after switching weapon sets/make them global.

Thanks in advance.