diff --git a/releases/3.2.0/settings.scr b/releases/3.2.0/settings.scr
index d9d7003..e0935d2 100644
--- a/releases/3.2.0/settings.scr
+++ b/releases/3.2.0/settings.scr
@@ -32,7 +32,7 @@
 
 
 // Half-Life Server Configuration Layout Script (stores last settings chosen, too)
-// File generated:  Thu Mar 03 11:29:18 PM
+// File generated:  Sun May 07 10:30:06 AM
 //
 //
 // Cvar	-	Setting
diff --git a/releases/3.2.0/source/mod/AvHGamerules.cpp b/releases/3.2.0/source/mod/AvHGamerules.cpp
index 9821bee..cb5c16e 100644
--- a/releases/3.2.0/source/mod/AvHGamerules.cpp
+++ b/releases/3.2.0/source/mod/AvHGamerules.cpp
@@ -1072,12 +1072,13 @@ bool AvHGamerules::CanEntityDoDamageTo(const CBaseEntity* inAttacker, const CBas
 			*outScalar = theScalar;
 		}
 
- 		if(!theTeamsAreDifferent && !AvHSUGetIsExternalClassName(STRING(inReceiver->pev->classname)))
+ 		if(!theTeamsAreDifferent && !AvHSUGetIsExternalClassName(STRING(inReceiver->pev->classname)) && theGameHasStarted )
  		{
 			AvHHive *theHive=(AvHHive *)dynamic_cast<const AvHHive *>(inReceiver);
-			if ( theHive != NULL && !this->GetIsEntityUnderAttack(theHive->entindex()) ) {
+			if ( theHive != NULL ) {
 				theCanDoDamage=false;
-				GetGameRules()->TriggerAlert((AvHTeamNumber)inAttacker->pev->team, ALERT_HIVE_DEFEND, theHive->entindex());
+				if ( !this->GetIsEntityUnderAttack(theHive->entindex()) )
+					GetGameRules()->TriggerAlert((AvHTeamNumber)inAttacker->pev->team, ALERT_HIVE_DEFEND, theHive->entindex());
 			}
 		}