diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index 4e30e6de42fd423ab81f23af1c73f2d3df8f576d..bbba28fe383c278a8a4470a59237e1ad2ec9fcb3 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -3,23 +3,25 @@
  */
 App.Utils.buildHeroArray = function() {
 	let array;
+	$.wiki(`<<include "custom Slaves Database">>`);
 	if (V.seeExtreme === 1) {
 		array = App.Data.HeroSlaves.D.concat(
 			App.Data.HeroSlaves.DD,
 			App.Data.HeroSlaves.DF,
 			App.Data.HeroSlaves.Dextreme,
 			App.Data.HeroSlaves.DDextreme,
-			App.Data.HeroSlaves.DFextreme
+			App.Data.HeroSlaves.DFextreme,
+			V.heroSlaves
 		);
 	} else {
 		array = App.Data.HeroSlaves.D.concat(
 			App.Data.HeroSlaves.DD,
-			App.Data.HeroSlaves.DF
+			App.Data.HeroSlaves.DF,
+			V.heroSlaves
 		);
 	}
-	if (V.heroSlaves) {
-		array = array.concat(V.heroSlaves);
-	}
+	delete V.heroSlaves;
+
 	for (let hero = 0; hero < array.length; hero++) {
 		if (V.seePreg !== 1 && [900089, 900102].includes(array[hero].ID)) {
 			array.splice(hero, 1);
diff --git a/src/npc/databases/customSlavesDatabase.tw b/src/npc/databases/customSlavesDatabase.tw
index 90b502e1f7327339c8c3a1788fc45a254b87e163..a2aba917737e7409517843321368077911e43166 100644
--- a/src/npc/databases/customSlavesDatabase.tw
+++ b/src/npc/databases/customSlavesDatabase.tw
@@ -1,4 +1,4 @@
-:: custom Slaves Database [nobr]
+:: custom Slaves Database
 
 <<set $heroSlaves = []>>
 <<set _i = 1000000>>