diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index a58e53d3d3e65b646fd7d17f91397b7c0ae2471f..44e67ce96d6181b72abf50bec04a27d07989dfd0 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -3139,10 +3139,13 @@
 		<span id="walkpast"><<link "Have $him brought out of $his cell">><<replace "#walk">><<include $target>><</replace>><</link>></span>
 	<<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
 		//$He is strapped into a milking machine and cannot leave $dairyName.//
-	<<elseif ($activeSlave.assignmentVisible == 0)>>
-		<span id="walkpast"><<link "Have $him take a break and come up">><<replace "#walk">><<include $target>><</replace>><</link>></span>
 	<<else>>
-		<span id="walkpast"><<link "Call $him over">><<replace "#walk">><<include $target>><</replace>><</link>></span>
+		<<switch $activeSlave.assignment>>
+			<<case "be your agent" "live with your agent" "work in the dairy" "work in the brothel" "serve in the club" "work as a servant" "serve in the master suite" "stay confined" "be confined in the cellblock" "be confined in the arcade" "work a glory hole" "be the Madam" "be your Concubine" "be the Wardeness" "live with your Head Girl" "be the Stewardess" "be the Schoolteacher" "be the Attendant" "be the DJ" "be the Milkmaid">>
+				<span id="walkpast"><<link "Have $him take a break and come up">><<replace "#walk">><<include $target>><</replace>><</link>></span>
+			<<default>>
+				<span id="walkpast"><<link "Call $him over">><<replace "#walk">><<include $target>><</replace>><</link>></span>
+		<</switch>>
 	<</if>>
 <<else>>
 	<<switch $target>>