I believe this fixes the weapon/armor issue for now.