diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 779bdfa2d955f9e4a43822c144f58ffc60344cbb..26f7eff13e2c4f0abe06f8015468de96db7b70f4 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -454,7 +454,7 @@ App.Entity.Facilities.Facility = class {
 		if (jobArray.length === 1) {
 			return jobArray[0].employees();
 		}
-		return V.slaves.filter(s => jobArray.some(j => j.isEmployed(s)));
+		return [].concat(...jobArray.map(j => j.employees()));
 	}
 
 	/**
@@ -462,9 +462,9 @@ App.Entity.Facilities.Facility = class {
 	 * @returns {Set<number>}
 	 */
 	employeesIDs() {
-		const jobArray = Object.values(this._jobs);
+		const jobArray = this.jobs;
 		if (jobArray.length === 1) {
-			return this.job().employeesIDs();
+			return jobArray[0].employeesIDs();
 		}
 		const res = new Set();
 		for (const j of jobArray) {