diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 51252a283c1d8b28791671ff8df38a2597892a72..341a32694d00113ce32ba26b3c33aae0ddda98ca 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -37,11 +37,11 @@ window.saWhore = (function saWhore() {
 		girl === "girl" ? loli = "loli" : loli = "shota";
 
 		gatherStatistics(slave);
+		updateNonSlaveVariables(slave); // must be run before applyFSDecoration() or you will face NaNs
 		if (slave.assignment === "work in the brothel") {
 			// By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. slaveJobValues() checks Edo Rivalist, so here we are.
 			applyFSDecoration(slave);
 		}
-		updateNonSlaveVariables(slave);
 		addCash(slave);
 		sexCounts(slave);
 		jobPreface(slave);
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index d665aac59a929593ab42724ea238c973b4bbcd3a..b601dbea3161905611f877b1fa9a594f1ca77c6c 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -161,7 +161,7 @@
 	<</if>>
 	<<if SlaveStatsChecker.isModded($slaves[_FLs])>>
 		<<set _modded += 1>>
-	<<elseif isUnmodded($slaves[_FLs])>>
+	<<elseif SlaveStatsChecker.isUnmodded($slaves[_FLs])>>
 		<<set _unmodded += 1>>
 	<</if>>
 	<<if isXY($slaves[_FLs])>>