diff --git a/constants.asm b/constants.asm
index 138cfeb..859ceb6 100644
--- a/constants.asm
+++ b/constants.asm
@@ -888,7 +888,8 @@ NamesOfWeapons ;the comment is an index in the tables
     dta d"Contact Trigger " ; 62
     dta d"White Flag      " ; 63
 weaponsOfDeath
-	dta 0,1,2,3,7,8,9,15,16,17,18,19,20,21,22,23,24,25,26,27
+	dta 1,2,3,7,15,16,17,18,19,20,21,22,23,24,25,26,27
+weaponsOfDeathEnd	
 joyToKeyTable
   ; .by  00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15
     .by $ff,$ff,$ff,$ff,$ff,$ff,$ff,$07,$ff,$ff,$ff,$06,$ff,$0f,$0e,$ff
diff --git a/scorch.asm b/scorch.asm
index 606f8dd..16a75a3 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -645,7 +645,7 @@ NoPlayerNoDeath
 MetodOfDeath
     lda random
     and #%00011111  ;  range 0-31
-	cmp #20 ; we have 20 weapons in table (from 0 to 19)
+	cmp #(weaponsOfDeathEnd-weaponsOfDeath) ; we have 20 weapons in table (from 0 to 19)
 	bcs MetodOfDeath
 	tay
 	lda weaponsOfDeath,y