Weapon fix (36/48)

Weapon fix