Default attack, weapon swap and action gem in the weapon

Hello,

I changed the action of my left click to Heavy attack instead of the default attack.
The HA gem is in my weapon.

When I swap weapons, the left click goes to the default attack (the gem/action is not available so it's OK).

When I swap a second time, the left click stays on default attack instead of beeing back associated with HA, as I would expect.

Yea I can confirm, this is pretty annoying.
I use weaponswap to cast auras and if I put my "default skill" gems either on weapon or shield, I have to setup default attack again everytime.
It forces me to put my default skill gems elsewhere than on weapon/shield. And as they have a +1 to gem level I'd REALLY like to put these gems here ^^