Fixed a bug that prevented removal of weapons/shields