diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 2887fe9fcc69f275bbc9e3c98e85b3d1e19a98dc..83936e6e8261769ccbc2840c92b121bb53934ca6 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -331,7 +331,34 @@ App.Entity.Facilities.Facility = class {
 	/** Number of already hosted slaves
 	 * @returns {number} */
 	get hostedSlaves() {
-		return State.variables[this.desc.baseName + "Slaves"];
+		switch (this.desc.baseName) {
+			case "brothel":
+				return State.variables.BrothiIDs.length;
+			case "arcade":
+				return State.variables.ArcadeiIDs.length;
+			case "cellblock":
+				return State.variables.CellBiIDs.length;
+			case "clinic":
+				return State.variables.CliniciIDs.length;
+			case "club":
+				return State.variables.ClubiIDs.length;
+			case "dairy":
+				return State.variables.DairyiIDs.length;
+			case "farmyard":
+				return State.variables.FarmyardiIDs.length;
+			case "HGSuite":
+				return State.variables.HGSuiteiIDs.length;
+			case "masterSuite":
+				return State.variables.MastSiIDs.length;
+			case "servantsQuarters":
+				return State.variables.ServQiIDs.length;
+			case "spa":
+				return State.variables.SpaiIDs.length;
+			case "nursery":
+				return State.variables.NurseryiIDs.length;
+			default:
+				return 0;
+		}
 	}
 
 	get hasFreeSpace() {