diff --git a/GameVersion.cpp b/GameVersion.cpp
index 151a34a30..c52962a75 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.336" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.338" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.07.08" };
+INT8		czVersionNumber[16]	= { "Build 06.07.09" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index a06cda6d7..7532dca32 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -6504,9 +6504,12 @@ UINT8 GetPercentTunnelVision( SOLDIERTYPE * pSoldier )
 	// Snap: check only attachments on a raised weapon!
 	if ( WeaponReady(pSoldier) )
 	{
+		if ( IsWeapon(pSoldier->inv[HANDPOS].usItem) ) //if not a weapon, then it was added already above
+			bns += Item[pSoldier->inv[HANDPOS].usItem].percenttunnelvision;
+
 		for (int i=0; i < MAX_ATTACHMENTS; i++)
 		{
-			bns += Item[pSoldier->inv[HANDPOS].usAttachItem[i]].percenttunnelvision ;
+			bns += Item[pSoldier->inv[HANDPOS].usAttachItem[i]].percenttunnelvision;
 		}
 	}
 
diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp
index d327baabe..88e2a96a6 100644
--- a/TacticalAI/DecideAction.cpp
+++ b/TacticalAI/DecideAction.cpp
@@ -1212,7 +1212,19 @@ DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("DecideActionGreen: Snipers like to raise
 					}
 				 else
 					{
-						pSoldier->usActionData = (UINT16)Random(8); 
+						INT32 iNoiseValue;
+						BOOLEAN fClimb;
+						BOOLEAN fReachable;
+						INT16 sNoiseGridNo = MostImportantNoiseHeard(pSoldier,&iNoiseValue, &fClimb, &fReachable);
+						UINT8 ubNoiseDir;
+
+						if (sNoiseGridNo != NOWHERE)
+							ubNoiseDir = atan8(CenterX(pSoldier->sGridNo),CenterY(pSoldier->sGridNo),CenterX(sNoiseGridNo),CenterY(sNoiseGridNo));
+	
+						if ( sNoiseGridNo != NOWHERE && pSoldier->bDirection != ubNoiseDir )
+							pSoldier->usActionData = ubNoiseDir; 
+						else
+							pSoldier->usActionData = (UINT16)PreRandom(8); 
 					}
 				} while (pSoldier->usActionData == pSoldier->bDirection);