diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index 7b93adc17b724f159287a3983dc643f17b736e90..ed13a9d60e0d54a08a52ec5960cdc7a03c40616c 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -1,7 +1,7 @@
 App.Update.Slave = function(slave, genepool = false) {
-	slave.geneticQuirks = Object.assign({
-		macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, polyhydramnios: 0, uterineHypersensitivity: 0, galactorrhea: 0, gigantism: 0, dwarfism: 0, neoteny: 0, progeria: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0
-	}, slave.geneticQuirks);
+	const quirks = {};
+	App.Data.genes.forEach((value, q) => quirks[q] = 0);
+	slave.geneticQuirks = Object.assign(quirks, slave.geneticQuirks);
 
 	if (slave.earShape === undefined) { slave.earShape = "normal"; }
 	if (slave.earT === undefined) { slave.earT = "none"; }
@@ -1037,4 +1037,7 @@ App.Update.Slave = function(slave, genepool = false) {
 			);
 		});
 	}
+	slave.womb.forEach(f => {
+		f.genetics.geneticQuirks = Object.assign(quirks, f.genetics.geneticQuirks);
+	});
 };
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index facf108f2a01ad970759c3ac6279724838b5481c..172db9c5abc0eaf88eb4bc9696d5ad84bc2f52b0 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -671,31 +671,8 @@ globalThis.generateGenetics = (function() {
 	 * @returns {object}
 	 */
 	function setGeneticQuirks(father, mother, sex) {
-		let quirks = {
-			macromastia: 0,
-			gigantomastia: 0,
-			fertility: 0,
-			hyperFertility: 0,
-			superfetation: 0,
-			polyhydramnios: 0,
-			uterineHypersensitivity: 0,
-			galactorrhea: 0,
-			gigantism: 0,
-			dwarfism: 0,
-			neoteny: 0,
-			progeria: 0,
-			pFace: 0,
-			uFace: 0,
-			albinism: 0,
-			heterochromia: 0,
-			rearLipedema: 0,
-			wellHung: 0,
-			wGain: 0,
-			wLoss: 0,
-			mGain: 0,
-			mLoss: 0,
-			androgyny: 0
-		};
+		const quirks = {};
+		App.Data.genes.forEach((value, q) => quirks[q] = 0);
 		let chance = 0;
 		let fatherGenes = 0;
 		/** @type {number} */