diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index aefa3922ab4d7cad60572a9368daca94af66c46e..db80b929d1c58d9a92ba665c2598c450d187266a 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1284,17 +1284,14 @@ window.GenerateNewSlave = (function() {
 		} else if (V.pedo_mode === 1 && V.one_time_age_overrides_pedo_mode === 0 && V.activeSlaveOneTimeMaxAge > 18) {
 			V.activeSlaveOneTimeMaxAge = 18;
 		}
-		if (V.retirementAge < V.activeSlaveOneTimeMaxAge) {
-			V.activeSlaveOneTimeMaxAge = (V.retirementAge - 1);
-		}
+		V.activeSlaveOneTimeMaxAge = Math.min(V.retirementAge - 1, V.activeSlaveOneTimeMaxAge);
+		V.activeSlaveOneTimeMinAge = Math.min(V.retirementAge - 1, V.activeSlaveOneTimeMinAge);
 		if (V.activeSlaveOneTimeMinAge < V.minimumSlaveAge) {
 			V.activeSlaveOneTimeMinAge = V.minimumSlaveAge;
 		} else if (V.pedo_mode === 1 && V.one_time_age_overrides_pedo_mode === 0) {
 			V.activeSlaveOneTimeMinAge = V.minimumSlaveAge;
 		}
-		if (V.activeSlaveOneTimeMaxAge < V.activeSlaveOneTimeMinAge) {
-			V.activeSlaveOneTimeMaxAge = V.activeSlaveOneTimeMinAge;
-		}
+		V.activeSlaveOneTimeMaxAge = Math.max(V.activeSlaveOneTimeMaxAge, V.activeSlaveOneTimeMinAge);
 		if (V.activeSlaveOneTimeMaxAge >= 30 && V.arcologies[0].FSMaturityPreferentialist !== "unset" && V.ageAdjustOverride !== 1) {
 			V.activeSlaveOneTimeMaxAge += 10;
 		}