diff --git a/entities/items/weapons.py b/entities/items/weapons.py
index 1e82a72..705beaa 100644
--- a/entities/items/weapons.py
+++ b/entities/items/weapons.py
@@ -5,7 +5,7 @@ from entities.items import weapon_syms as _syms
 class BrSimWeapon(_item.BrSimItem):
 
   def __init__(self, wtype= None):
-    self.weapon= _syms.WEAPONS[wtype or _random.randint(1,2)]
+    self.weapon= _syms.WEAPONS.get(wtype) or _syms.WEAPONS.get(_random.choice(list(_syms.WEAPONS.keys())))
     self.name= self.weapon['name']
     self.damage= self.weapon['damage']
     self.weight= self.weapon['weight']