diff --git a/REDALERT/.INFANTRY.CPP.kate-swp b/REDALERT/.INFANTRY.CPP.kate-swp
new file mode 100644
index 000000000..0ee04697e
Binary files /dev/null and b/REDALERT/.INFANTRY.CPP.kate-swp differ
diff --git a/REDALERT/UNIT.CPP b/REDALERT/UNIT.CPP
index fff58b1ee..18ee32115 100644
--- a/REDALERT/UNIT.CPP
+++ b/REDALERT/UNIT.CPP
@@ -479,7 +479,8 @@ void UnitClass::AI(void)
 	/*
 	**	Scatter units off buildings in guard modes.
 	*/
-	if (!IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord].Cell_Building() != NULL) {
+    // Chthon CFE Note: bugfix missing IsActive check, as per https://github.com/TheAssemblyArmada/Vanilla-Conquer/pull/430
+	if (IsActive && !IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord].Cell_Building() != NULL) {
 		Scatter(0, true, true);
 	}
 
diff --git a/TIBERIANDAWN/INFANTRY.CPP b/TIBERIANDAWN/INFANTRY.CPP
index 6652854db..a5374b344 100644
--- a/TIBERIANDAWN/INFANTRY.CPP
+++ b/TIBERIANDAWN/INFANTRY.CPP
@@ -1138,7 +1138,8 @@ void InfantryClass::AI(void)
 	/*
 	**	Scatter infantry off buildings in guard modes.
 	*/
-	if (!IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord_Cell(Coord)].Cell_Building() != NULL) {
+    // Chthon CFE Note: bugfix missing IsActive check, as per https://github.com/TheAssemblyArmada/Vanilla-Conquer/pull/430
+	if (IsActive && !IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord_Cell(Coord)].Cell_Building() != NULL) {
 		Scatter(0, true, true);
 	}
 
diff --git a/TIBERIANDAWN/UNIT.CPP b/TIBERIANDAWN/UNIT.CPP
index b56bead24..4816c1568 100644
--- a/TIBERIANDAWN/UNIT.CPP
+++ b/TIBERIANDAWN/UNIT.CPP
@@ -567,7 +567,8 @@ void UnitClass::AI(void)
 	/*
 	**	Scatter units off buildings in guard modes.
 	*/
-	if (!IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord_Cell(Coord)].Cell_Building() != NULL) {
+    // Chthon CFE Note: bugfix missing IsActive check, as per https://github.com/TheAssemblyArmada/Vanilla-Conquer/pull/430
+	if (IsActive && !IsTethered && !IsFiring && !IsDriving && !IsRotating && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord_Cell(Coord)].Cell_Building() != NULL) {
 		Scatter(0, true, true);
 	}