When entering a new zone current active weapon set bugs out

If you have the second weapon swap active and enters a new zone, the counter is always set to weapon set 1. But the weapons themselves are not swapped.

When the weapon swap button is pressed then it will swap but only the counter. The weapons remain the same. You will need to press the weapon swap button again for normal behaviour to be restored.