diff --git a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_5.cfg b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_5.cfg
index e8663166..573e75de 100644
--- a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_5.cfg
+++ b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_5.cfg
@@ -9,7 +9,7 @@
 		"filter"        ""
 		"weaponid"      "2384422"
 		"buttonid"      "2384433"
-		"triggerid"     "0"
+		"triggerid"     "4042883"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -23,7 +23,7 @@
 		"filter"        ""
 		"weaponid"      "2347448"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042880"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -37,7 +37,7 @@
 		"filter"        ""
 		"weaponid"      "2347138"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042877"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -51,7 +51,7 @@
 		"filter"        ""
 		"weaponid"      "2347177"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042877"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -65,7 +65,7 @@
 		"filter"        ""
 		"weaponid"      "5349903"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "5310773"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -79,7 +79,7 @@
 		"filter"        ""
 		"weaponid"      "1397716"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042874"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -93,7 +93,7 @@
 		"filter"        ""
 		"weaponid"      "6082283"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042868"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -107,7 +107,7 @@
 		"filter"        ""
 		"weaponid"      "6082267"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042868"
 		"display"       "5"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -121,7 +121,7 @@
 		"filter"        ""
 		"weaponid"      "1397990"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042865"
 		"display"       "0"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -135,7 +135,7 @@
 		"filter"        ""
 		"weaponid"      "1398014"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042865"
 		"display"       "0"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -150,7 +150,7 @@
 		"weaponid"      "1398000"
 		"buttonid"      "0"
 		"triggerid"     "0"
-		"display"       "0"
+		"display"       "4042865"
 		"mode"          "0"
 		"maxuses"       "0"
 		"cooldown"      "0"
@@ -163,7 +163,7 @@
 		"filter"        ""
 		"weaponid"      "1398006"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042865"
 		"display"       "0"
 		"mode"          "0"
 		"maxuses"       "0"
@@ -177,7 +177,7 @@
 		"filter"        ""
 		"weaponid"      "1398012"
 		"buttonid"      "0"
-		"triggerid"     "0"
+		"triggerid"     "4042865"
 		"display"       "0"
 		"mode"          "0"
 		"maxuses"       "0"
diff --git a/_entWatch4/scripting/entWatch-core.sp b/_entWatch4/scripting/entWatch-core.sp
index 31bead88..9c96940d 100644
--- a/_entWatch4/scripting/entWatch-core.sp
+++ b/_entWatch4/scripting/entWatch-core.sp
@@ -341,9 +341,8 @@ public void OnEntityDestroyed(int entity)
 
 			if (item.bWeapon && item.iWeapon == entity)
 			{
-				g_hArray_Items.Erase(index);
+				item.iWeapon = INVALID_ENT_REFERENCE;
 
-				delete item;
 				return;
 			}
 			else if (item.bButton && item.iButton == entity)