diff --git a/src/pregmod/slaveSlaveSwapWorkaround.tw b/src/pregmod/slaveSlaveSwapWorkaround.tw
index 0d0bfb1c0c2f8b184fb7a4f86099c43c6de11a0a..72ee529f98f13facdc558e6afab2ce7ee8578f93 100644
--- a/src/pregmod/slaveSlaveSwapWorkaround.tw
+++ b/src/pregmod/slaveSlaveSwapWorkaround.tw
@@ -1,9 +1,8 @@
 :: Slave Slave Swap Workaround [nobr]
 
 <<set $nextButton = "Abort Operation", $nextLink = "Main">>
-<<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>>
 
-The surgeon awaits the pair of slaves to be strapped into the surgery. So far only $activeSlave.slaveName is prepped:
+The surgeon awaits the pair of slaves to be strapped into the surgery. So far only <<= getSlave($AS).slaveName>> is prepped:
 <br>
 //Select the slave who will be trading bodies with $him. This operation will cost <<print cashFormat(10000)>>.//
 
@@ -13,7 +12,7 @@ __Select an eligible slave:__
 	<<capture _i>>
 		<<if isSlaveAvailable($slaves[_i])>>
 			<<if $slaves[_i].fuckdoll == 0>>
-				<<if ($slaves[_i].ID != $activeSlave.ID)>>
+				<<if ($slaves[_i].ID != $AS)>>
 					<<set _name = SlaveFullName($slaves[_i])>>
 					<br>[[_name|Slave Slave Swap][$swappingSlave = $slaves[_i], cashX(-10000, "slaveSurgery", $slaves[_i])]]
 				<</if>>