Weapon fix (30/48)

Weapon fix