Arrows do not get put back into quiver after switching to a two-handed weapon.

When I switch from Bow with a quiver (either in inventory or curio slot), the arrows remain in the offhand when switching to a two-handed weapon.

The main issue arises when scrolling from bow and quiver to two-handed weapon and then to a one-handed weapon and shield after this, which results in the shield not getting equipped since the arrows are still in your offhand.

Currently using spartan weaponry and spartan shields and curios API.

Thanks