Fix issue with static weapon saving