diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index d21f6e7bf2129cd3c13144cb61eeefa25e23e604..f8479dde9a96ec616ffd7c69d74b851f12e624ef 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -320,18 +320,17 @@ is
 				<<set _nameloss = 1>>
 			<</if>>
 		<<elseif $activeSlave.slaveSurname != $activeSlave.birthSurname>>
-			<<if $activeSlave.slaveSurname === 0>>
-				$He once had a surname;
-				<<if $activeSlave.birthSurname === "">>
-					whatever it was, however, has been lost forever.
-					<<set _nameloss = 1>>
-				<</if>>
-			<<else>>
+			<<if $activeSlave.slaveSurname === 0 && $activeSlave.birthSurname === "">>
+				$He once had a surname; whatever it was, however, has been lost forever.
+				<<set _nameloss = 1>>
+			<<elseif $activeSlave.slaveSurname !== 0>>
 				$activeSlave.slaveSurname is not $his original surname;
 				<<if $activeSlave.birthSurname === "">>
 					whatever it was, however, has been lost forever.
 					<<set _nameloss = 1>>
 				<</if>>
+			<<else>>
+				<<set _nameloss = 1>>
 			<</if>>
 		<</if>>
 		<<if $activeSlave.birthName !== "" || $activeSlave.birthSurname !== "">>