diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 647439af..636de6a3 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -2294,8 +2294,10 @@ BOOLEAN ValidAttachment( UINT16 usAttachment, OBJECTTYPE * pObj, UINT8 * pubAPCo
 	if ( !pObj->exists() )
 		return FALSE;
 
-	// shadooow: efficiency check, we are passing all kinds of items into this function that are not neccessary attachments at all
-	if (!Item[usAttachment].attachment && !Item[usAttachment].hiddenaddon)
+	// shadooow: efficiency check, we are passing all kinds of items into this function that are not necessary attachments at all
+	if (!Item[usAttachment].attachment && 
+		!Item[usAttachment].hiddenaddon &&
+		!((Item[usAttachment].usItemClass & IC_GUN) && Item[pObj->usItem].tripwire))
 		return FALSE;
 
 	if( UsingNewAttachmentSystem() )