diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
index 9b6848aa5c..5949320405 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -4473,17 +4473,17 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 		//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 		//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
 
-		// horde
 		if( horde )
-		{
 			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
-
-		}  // end if
 		else
 			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
 
-		// nationalism
+#if RETAIL_COMPATIBLE_CRC
 		if( nationalism )
+#else
+		//TheSuperHackers @bugfix GeneralCamo/Mauller nationalism should only be applied when within a horde
+		if( horde && nationalism )
+#endif
 			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
 		else
 			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
index ea1e2f8c2a..21d5e7a358 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -4742,29 +4742,32 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 		//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 		//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
 
-		// horde
 		if( horde )
-		{
 			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
-
-		}  // end if
 		else
 			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
 
-		// nationalism
+#if RETAIL_COMPATIBLE_CRC
 		if( nationalism )
-    {
+#else
+		//TheSuperHackers @bugfix GeneralCamo/Mauller nationalism and fanaticism should only be applied when within a horde
+		if( horde && nationalism )
+#endif
+		{
 			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
-      // fanaticism
-      if ( fanaticism )
-        us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );// FOR THE NEW GC INFANTRY GENERAL
-      else 
-        us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
-    }
+
+			if ( fanaticism )
+				us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+			else
+				us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
 		else
+		{
 			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
-
-
+#if !RETAIL_COMPATIBLE_CRC
+			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+#endif
+		}
 
 	}  // end if
 #ifdef ALLOW_DEMORALIZE