i met a similar situation:
when my archer switch his bow to fail and shield, after battle, his weapon wont be reset,
but if he enter the battle with fail and shield while, during the battle he switch them to his bow, after battle, his weapon will be reset.
