Mercenary Weapon Swap issues

The issue still not fix as I understand?
I have try my Merc to use bow as secondary or staff as secondary and when I swap back to crossbow, I can not shoot. I need to roll which not always help.

Just brining this up for attention.
Thank you :)

Seemingly got this after getting glacial bolt skill with cold infusion and glaciation as Mercenary. Entered trial of Sekhremah area, shot once with glacial bolt, reloaded my diad crossbow and that's it. At first thought it's part of trial, but then i get to the part when you have to kill rare mobs for pouring the chalice i tried to go to different locations aaaand the issue is still there.
Can only punch and use Contagion =(