Lunar blessing weapon swap issue post hotfix 0.4.0b 5

Was very happy to see the hotfix for moonbeams on Lunar blessing weapon swap, however there's still some lingering issues.

If you have the same weapon locked for both sets from inventory, but lock Lunar Blessing to only use set II and not I, it will not swap set when cast.

I have passives for set I set to normal dmg/mapping and set II for increased duration and area. If I manually swap into weapon set II and cast Lunar Blessing you get the increased duration. If I lock the skill to use only set II, not I, and cast it while in set I, you get the short duration without passive bonuses. It will not trigger a swap at all and keep you in set I.

The buff and moonbeam works now of course. But I think the swapping is just broke.

Same problem here

the buff does not work, as soon as I shift forms it is lost