diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 1786cd21cdfb5bb364a92734b259f18dcd6a76c0..ca259fbdadeb5d72d4adcc94369d010c0128c648 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -905,14 +905,14 @@ class RevampedArtControl {
 		let leftArmType = "";	// FIXME: unused variable
 		let rightArmType = "";	// FIXME: unused variable
 
-		if (this.artSlave.amp === 1) {
+		if (!hasAnyArms(artSlave)) {
 			result.push("Art_Vector_Revamp_Arm_Stump");
 		} else {
 			result.push(`Art_Vector_Revamp_Arm_Right_${this.rightArmType}`);
 			result.push(`Art_Vector_Revamp_Arm_Left_${this.leftArmType}`);
 		}
 
-		if (this.showArmHair && (this.artSlave.amp === 1 || (this.leftArmType === "High" && this.artSlave.amp !== 1))) {
+		if (this.showArmHair && (!hasAnyArms(artSlave) || (this.leftArmType === "High"))) {
 			switch (this.artSlave.underArmHStyle) {
 				case "bushy":
 					result.push("Art_Vector_Revamp_Arm_Up_Hair_Bushy");
@@ -930,7 +930,7 @@ class RevampedArtControl {
 	get buttLayer() {
 		let result = [];
 		let buttSize = 0;
-		if (this.artSlave.amp) {
+		if (!hasAnyLegs(artSlave)) {
 			return result;
 		}
 
@@ -952,7 +952,7 @@ class RevampedArtControl {
 	get legLayer() {
 		let result = [];
 
-		if (this.artSlave.amp === 1) {
+		if (!hasAnyLegs(artSlave)) {
 			result.push("Art_Vector_Revamp_Stump");
 		} else {
 			let legSize = "Normal";
@@ -979,7 +979,7 @@ class RevampedArtControl {
 	get feetLayer() {
 		let result = [];
 
-		if (this.artSlave.amp === 1) {
+		if (!hasAnyLegs(artSlave)) {
 			return result;
 		}
 
@@ -1013,7 +1013,7 @@ class RevampedArtControl {
 			result.push("Art_Vector_Revamp_Torso_Highlights1");
 		}
 
-		if (this.showArmHair && this.leftArmType !== "High" && this.artSlave.amp !== 1) {
+		if (this.showArmHair && this.leftArmType !== "High" && hasAnyArm(artSlave)) {
 			switch (this.artSlave.underArmHStyle) {
 				case "bushy":
 					result.push("Art_Vector_Revamp_Arm_Down_Hair_Bushy");