diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index ad44b300..f428d8f8 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -13131,7 +13131,7 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
 		{
 			// Flugente: zombies do not kick
 			BOOLEAN nokick = FALSE;
-			if ( this->IsZombie( ) )
+			if ( this->IsZombie( ) || !IS_MERC_BODY_TYPE(this))//shadooow: fix for endless clock issue with Elliot in interrogation cutscene 
 				nokick = TRUE;
 
 			// sevenfm: don't use kick when attacking with any weapon in hand
diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp
index 489faff1..66fa676e 100644
--- a/TacticalAI/AIMain.cpp
+++ b/TacticalAI/AIMain.cpp
@@ -1470,7 +1470,7 @@ void CancelAIAction(SOLDIERTYPE *pSoldier, UINT8 ubForce)
 	ActionDone(pSoldier);
 
 	// sevenfm: reset next action
-	if(!AreInMeanwhile() && pSoldier->ubProfile == NO_PROFILE)
+	if(!AreInMeanwhile()))
 	{
 		pSoldier->aiData.bNextAction = AI_ACTION_NONE;
 		pSoldier->aiData.usNextActionData = 0;