diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 3405ab4b97e1d48b0d4a2e12ae655dda4a87fb09..718d50c919401a8648b14e3ba00bf881e1596419 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -108,9 +108,20 @@
 	<<print "Slave has normal limbs, limb interface reset to 0 (no interface)">><br>
 	<<set $tempSlave.PLimb = 0>>
 <</if>>
-<<if ($tempSlave.PLimb == 0) && hasAllProstheticLimbs($tempSlave)>>
-	<<print "Slave has no prosthetic limb interface, remove all limbs">>
-	<<run removeLimbs($tempSlave, "all")>>
+<<if $tempSlave.PLimb === 0 && hasAnyProstheticLimbs($tempSlave)>>
+	<<print "Slave has no prosthetic limb interface, remove all prosthetic limbs">>
+	<<if getLeftArmID($tempSlave) > 1>>
+		<<run removeLimbs($tempSlave, "left arm")>>
+	<</if>>
+	<<if getRightArmID($tempSlave) > 1>>
+		<<run removeLimbs($tempSlave, "right arm")>>
+	<</if>>
+	<<if getLeftLegID($tempSlave) > 1>>
+		<<run removeLimbs($tempSlave, "left leg")>>
+	<</if>>
+	<<if getRightLegID($tempSlave) > 1>>
+		<<run removeLimbs($tempSlave, "right leg")>>
+	<</if>>
 <</if>>
 <<if !hasAnyLegs($tempSlave)>>
 	<<set $tempSlave.heels = 0>>