diff --git a/src/facilities/facilityRetrievalWorkaround.js b/src/facilities/facilityRetrievalWorkaround.js
index 864638388abd43dd3485abac205ebe5804441876..992825e8a280710423d93ea130400d7ec2df57aa 100644
--- a/src/facilities/facilityRetrievalWorkaround.js
+++ b/src/facilities/facilityRetrievalWorkaround.js
@@ -115,15 +115,12 @@ App.UI.facilityRetrievalWorkaround = function(facility) {
 	}
 
 	function checkOrgans(slave) {
-		if (V.incubator.organs.length > 0) {
-			for (const organ of V.incubator.organs.filter(o => o.ID === slave.ID)) {
-				const newOrgan = {type: organ.type, weeksToCompletion: organ.weeksToCompletion, ID: slave.ID};
-				if (newOrgan.weeksToCompletion <= 0) {
-					V.completedOrgans.push(organ);
-				} else {
-					V.organs.push(newOrgan);
-				}
-				V.incubator.organs.deleteAt(organ);
+		const movedOrgans = V.incubator.organs.deleteWith(o => o.ID === slave.ID)
+		for (const organ of movedOrgans) {
+			if (organ.weeksToCompletion <= 0) {
+				V.completedOrgans.push(organ);
+			} else {
+				V.organs.push(organ);
 			}
 		}
 	}