Weapon Set switching bugged

I had skills set up with my weapons sets so I could use the blink with my weapon set 2 and all my other buffs on weapon set 1. It was working even after the patch, but once I moved some gems around, (switched it back also) it suddenly broke. When I switch to weapon set two, my skills that I have on weapon set 1 are still active even though I unchecked the II box of them. So since they're still active, my blink skill can't turn on because of the spirit reserve.