diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index f9d0938046afe64924d1d3f72a94bb472e5a4da4..218dcf52171c1f9b2c4c25fa21a054641eecd21c 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -61,8 +61,8 @@ App.Update.backwardsCompatibility = function() {
 		div = App.UI.DOM.appendNewElement("div", f, `Updating global variables... `);
 		App.Update.globalVariables(div);
 
-		div = App.UI.DOM.appendNewElement("div", f, `Updating slave variables... `);
-		App.Update.slaveVariables(div);
+		div = App.UI.DOM.appendNewElement("div", f, `Checking slave record type, updating indices... `);
+		App.Update.slaveIndices(div);
 
 		div = App.UI.DOM.appendNewElement("div", f, `Updating slave records... `);
 		App.Update.slaveRecords(div);
@@ -1344,30 +1344,19 @@ App.Update.globalVariables = function(node) {
 	node.append(`Done!`);
 };
 
-App.Update.slaveVariables = function(node) {
-	/* Adding a new variable? Consider putting it in datatypeCleanup.js instead of here */
+App.Update.slaveIndices = function(node) {
 	for (let bci = 0; bci < V.slaves.length; bci++) {
-		let Slave = V.slaves[bci];
-
-		if (typeof Slave !== "object") {
+		if (typeof V.slaves[bci] !== "object") {
 			V.slaves.deleteAt(bci);
 			bci--;
 			continue;
 		}
-
-		App.Update.Slave(Slave);
-
-		V.slaves[bci] = Slave;
 	}
 	V.slaveIndices = slaves2indices();
 	node.append(`Done!`);
 };
 
 App.Update.slaveRecords = function(node) {
-	V.slaves.forEach((slave) => {
-		App.Entity.Utils.SlaveDataSchemeCleanup(slave);
-		SlaveDatatypeCleanup(slave);
-	});
 	const detachedSlaves = [
 		V.hostage,
 		V.slaveAfterRA,
@@ -1375,11 +1364,17 @@ App.Update.slaveRecords = function(node) {
 		V.traitor,
 		V.shelterSlave
 	];
+
+	const updateRecord = (slave) => {
+		App.Update.Slave(slave);
+		App.Entity.Utils.SlaveDataSchemeCleanup(slave);
+		SlaveDatatypeCleanup(slave);
+	};
+
+	V.slaves.forEach((slave) => updateRecord(slave));
 	for (const slave of detachedSlaves) {
 		if (typeof slave !== "undefined" && slave !== 0) {
-			App.Update.Slave(slave);
-			App.Entity.Utils.SlaveDataSchemeCleanup(slave);
-			SlaveDatatypeCleanup(slave);
+			updateRecord(slave);
 		}
 	}