diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index f45c7be882145a6d2a2567a6ab9e328d9e78fab2..2f85a7c9cbf3edac07b0fab935b7280dd6943273 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -10,9 +10,9 @@
 <</if>>
 
 <<if $slaves[$i].rivalry > 0>>
-	<<set _i = getSlave($slaves[$i].rivalryTarget)>>
-	<<if def _i>>
-		<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
+	<<set _slave = getSlave($slaves[$i].rivalryTarget)>>
+	<<if def _slave>>
+		<<set _slave.rivalry = 0, _slave.rivalryTarget = 0>>
 	<<else>>
 		@@.red;Error, rival not found.@@
 	<</if>>
@@ -20,9 +20,9 @@
 <</if>>
 
 <<if $slaves[$i].relationship > 0 && $slaves[$i].relationship < 4>>
-	<<set _i = getSlave($slaves[$i].relationshipTarget)>>
-	<<if _i != -1>>
-		<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
+	<<set _slave = getSlave($slaves[$i].relationshipTarget)>>
+	<<if def _slave>>
+		<<set _slave.relationship = 0, _slave.relationshipTarget = 0>>
 	<<else>>
 		@@.red;Error, relationshipTarget not found.@@
 	<</if>>