weapon chooser bug fix