Fix weapon selection index issue #30