Bugfix for armor and weapons