Weapon fix (27/48)

Weapon fix