Weapons - Fixed #446