diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 1a5983b60725e6798fd64d4d3fcb80fbfefad65d..e84fd0ea6d3d8910c541cdc1f05c2451a17e6f41 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -8,11 +8,17 @@
 	''Any one of your slaves would have been selected for a random non-individual event:''
 	<br>
 	<<for $i = 0; $i < $slaves.length; $i++>>
-	   	<<if $slaves[$i].slaveSurname == 0 || $slaves[$i].slaveSurname == "">>
-			<br><<print "[[$slaves[$i].slaveName|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
+	   	<<if $slaves[$i].slaveSurname>>
+			<<switch $slaves[$i].nationality>>
+				<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+					<<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>>
+				<<default>>
+					<<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
+			<</switch>>
 		<<else>>
-			<br><<print "[[$slaves[$i].slaveName + ' ' + $slaves[$i].slaveSurname|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
+			<<set _slaveName = $slaves[$i].slaveName>>
 		<</if>>
+		<br><<print "[[_slaveName|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
 	<</for>>
 	<br><br>[[Switch to RIE Eligibility Check|RIE Eligibility Check][$activeSlave = 0, $eventSlave = 0]]
   <<else>>