diff --git a/display.asm b/display.asm
index 51cd736..817666e 100644
--- a/display.asm
+++ b/display.asm
@@ -34,7 +34,7 @@ OptionsScreenEnd
 ListOfWeapons
                        ;     0123456789012345678901234567890123456789
 ; :number_of_offensives dta d"                                "
-  :33 dta d"                                "
+  :32 dta d"                                "
 ListOfWeapons1End
 ListOfDefensiveWeapons
 ; :number_of_defensives dta d"                                "
diff --git a/scorch.xex b/scorch.xex
index f946e75..6e99679 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/textproc.asm b/textproc.asm
index d7fd93f..95891ff 100644
--- a/textproc.asm
+++ b/textproc.asm
@@ -702,12 +702,13 @@ WeHaveOffset
     adw xbyte #ListOfWeapons
     ldy #0
 ClearList1
+    cpw xbyte #ListOfWeapons1End
+	beq ListCleared1
     tya
     sta (xbyte),y
     inw xbyte
-    cpw xbyte #ListOfWeapons1End
-    bne ClearList1
-
+    jmp ClearList1
+ListCleared1
     ; And the same we do with the second list
 
     ; Multiply number on list 1 by 32 and set address