Cant swap weapons on controller between two handed maces & mace & shield

Hi! This is for POE2.
Cant swap weapons on controller between two handed maces & mace & shield. When U swap and use(hold) LB to one handed mace with shield it never swaps back to your two handed mace when U release the button. It uses the one handed mace on all your skills and you are stuck with just using your one handed mace. Please fixar this A.S.A.P 🙏🏻

Not sure if you know this but on controller you can tie your skill gems to each weapon or both even. Open the skill gem up and see what boxes are checked hope this helps.