Crossbow in second weapon set never used with ammo skills

I have crossbows in both weapon sets.

Swap to the second weapon set with X, and load any type of ammo the crossbow is allowed to use. The second weapon slot is still selected, until firing the ammo, which flips back to the first weapon set.

If the first weapon set is not assigned to that ammo type, a generic bolt is fired instead.

If there is no weapon in the first weapon set, and a crossbow in the second weapon set, the character punches when trying to fire the ammo.

Grenades are not impacted by this bug, they can be used with either weapon, and flip to whichever set they are assigned to.

ID 3,159,226,111