diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js
index d08af84c883f82f754139fbccdcac899c79bad7e..acce98a8329fa781d6d392059ee753aa1f261429 100644
--- a/js/003-data/slaveWearData.js
+++ b/js/003-data/slaveWearData.js
@@ -1249,7 +1249,7 @@ App.Data.buttplugs = new Map([
 		{
 			name: "Huge plug",
 			width: 3,
-			length: 2
+			length: 1
 		}
 	],
 	["long, huge plug",
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 5d4f914ce1e79c5ad93b0351728babbfc360dd92..6db2efd28da4339f90816a23490cfeb35002f723 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -492,9 +492,10 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
 		}
 		el.appendChild(label);
 
-		let optionsArray = [];
+		let normalArray = [];
+		let longArray = [];
 
-		for (const [key, object] of App.Data.slaveWear.buttplugs) {
+		for (const [key, object] of App.Data.buttplugs) {
 			if (key === "none") {
 				// skip none in set, we set the link elsewhere.
 				continue;
@@ -504,17 +505,19 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
 				updateSlave: {buttplug: key},
 				FS: object.fs,
 			};
-			optionsArray.push(reshapedItem);
+			if (object.length > 1) {
+				longArray.push(reshapedItem);
+			} else {
+				normalArray.push(reshapedItem);
+			}
 		}
 
 		// Sort
 		// No sort here since we want small -> large. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
 
 		// Options
-		let links = document.createElement('div');
-		links.className = "choices";
-		links.appendChild(generateRows(optionsArray, "buttplug", true));
-		el.appendChild(links);
+		App.UI.DOM.appendNewElement("div", el, generateRows(normalArray, "buttplug", true), "choices");
+		App.UI.DOM.appendNewElement("div", el, generateRows(longArray, "buttplug", true), "choices");
 
 		return el;
 	}
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index c5a1940e32584378eb2bb81ff924d7196a2c7afa..3721d2bf853d8c39bb4ea85fc3bd070776488a5e 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -28,7 +28,7 @@ globalThis.isItemAccessible = (function() {
 				selectedDB = App.Data.slaveWear.bellyAccessories;
 				break;
 			case "buttplug":
-				selectedDB = App.Data.slaveWear.buttplugs;
+				selectedDB = App.Data.buttplugs;
 				break;
 			case "buttplugAttachment":
 				selectedDB = App.Data.slaveWear.buttplugAttachments;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7bf0077d52297b8434d0519b6134dcc5d3360f2b..294b86564f30c9595c969fb68c540dbb72a02da9 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2000,7 +2000,7 @@ App.RA.options = (function() {
 
 	class ButtplugsVirginsList extends ListSelector {
 		constructor() {
-			super("Buttplugs for anal virgins", isItemAccessible.array(App.Data.slaveWear.buttplugs));
+			super("Buttplugs for anal virgins", isItemAccessible.array(App.Data.buttplugs));
 			this.setValue(current_rule.set.aVirginButtplug);
 			this.onchange = (value) => current_rule.set.aVirginButtplug = value;
 		}
@@ -2008,7 +2008,7 @@ App.RA.options = (function() {
 
 	class ButtplugsOtherList extends ListSelector {
 		constructor() {
-			super("Buttplugs for other slaves", isItemAccessible.array(App.Data.slaveWear.buttplugs));
+			super("Buttplugs for other slaves", isItemAccessible.array(App.Data.buttplugs));
 			this.setValue(current_rule.set.buttplug);
 			this.onchange = (value) => current_rule.set.buttplug = value;
 		}