diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 0ddae929c878aaeab2adccd4989febd706e609d8..ccecc84e0b27302b4c12b2ca58a6db1269f9a584 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -26,12 +26,36 @@ window.generateGenetics = (function() {
 			activeMother = V.PC;
 			mother = V.PC;
 		}
-		father = (actor2 > 0) ? V.genePool.find(function(s) { return s.ID == actor2; })
-			: (actor2 == -1) ? V.PC
-			: 0;
-		activeFather = (father !== 0 && father.ID > 0) ? V.slaves[V.slaveIndices[actor2]]
-			: (father !== 0 && father.ID == -1) ? V.PC
-			: 0;
+		if (actor2 > 0) {
+			father = V.genePool.find(function(s) { return s.ID == actor2.ID; });
+			activeFather = V.slaves[V.slaveIndices[actor2]];
+			if (father === undefined) {
+				father = V.slaves.find(function(s) { return s.ID == actor2.ID; });
+				activeFather = V.slaves[V.slaveIndices[actor2]];
+			}
+			if (father === undefined) {
+				if (V.incubator > 0) {
+					father = V.tanks.find(function(s) { return s.ID == actor2.ID; });
+					activeFather = 0;
+				}
+			}
+			if (father === undefined) {
+				if (V.nursery > 0) {
+					father = V.cribs.find(function(s) { return s.ID == actor2.ID; });
+					activeFather = 0;
+				}
+			}
+			if (father === undefined) {
+				father = 0;
+				activeFather = 0;
+			}
+		} else if (actor2 == -1) {
+			father = V.PC;
+			activeFather = V.PC;
+		} else {
+			father = 0;
+			activeFather = 0;
+		}
 
 		genes.gender = setGender(father);
 		genes.name = setName(x);
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 7fa88b12bbd8ac7e2c025fc56e14d5f7044d1fdf..6b1ef4a36896c3a149e0cd4e973aeb02f0d0393a 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1477,7 +1477,7 @@
 <<case "immigrant">>
 
 <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
-<<include "Generate XX Slave">>
+<<include "Generate New Slave">>
 <<set $activeSlave.origin = "She sold herself into slavery to pay her immigration costs.">>
 <<set $activeSlave.devotion = random(-45,-25)>>
 <<set $activeSlave.trust = random(-15,0)>>