Weapon fix (16/48)

Weapon fix