diff --git a/public/script.js b/public/script.js
index a03920876..fbf086458 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1731,7 +1731,6 @@ async function Generate(type, automatic_trigger, force_name2) {
                 console.log('generating prompt');
                 chatString = "";
                 arrMes = arrMes.reverse();
-                let is_add_personality = false;
                 arrMes.forEach(function (item, i, arr) {//For added anchors and others
 
                     if (i >= arrMes.length - 1 && $.trim(item).substr(0, (name1 + ":").length) != name1 + ":") {
@@ -1739,12 +1738,11 @@ async function Generate(type, automatic_trigger, force_name2) {
                             item = item.substr(0, item.length - 1);
                         }
                     }
-                    if (i === arrMes.length - topAnchorDepth && count_view_mes >= topAnchorDepth && !is_add_personality) {
-                        is_add_personality = true;
+                    if (i === arrMes.length - topAnchorDepth && count_view_mes >= topAnchorDepth && !is_pygmalion) {
                         //chatString = chatString.substr(0,chatString.length-1);
                         //anchorAndPersonality = "[Genre: roleplay chat][Tone: very long messages with descriptions]";
                         let personalityAndAnchor = [charPersonality, anchorTop].filter(x => x).join(' ');
-                        if (personalityAndAnchor && !is_pygmalion) {
+                        if (personalityAndAnchor) {
                             item += "[" + personalityAndAnchor + ']\n';
                         }
                     }
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index f61e73e33..020225dd5 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -201,14 +201,12 @@ function setOpenAIMessageExamples(mesExamplesArray) {
 
 function generateOpenAIPromptCache(charPersonality, topAnchorDepth, anchorTop, anchorBottom) {
     openai_msgs = openai_msgs.reverse();
-    let is_add_personality = false;
     openai_msgs.forEach(function (msg, i, arr) {//For added anchors and others
         let item = msg["content"];
-        if (i === openai_msgs.length - topAnchorDepth && count_view_mes >= topAnchorDepth && !is_add_personality) {
-            is_add_personality = true;
-            if ((anchorTop != "" || charPersonality != "")) {
-                if (anchorTop != "") charPersonality += ' ';
-                item = `[${name2} is ${charPersonality}${anchorTop}]\n${item}`;
+        if (i === openai_msgs.length - topAnchorDepth && count_view_mes >= topAnchorDepth) {
+            let personalityAndAnchor = [charPersonality, anchorTop].filter(x => x).join(' ');
+            if (personalityAndAnchor) {
+                item = `[${name2} is ${personalityAndAnchor}]\n${item}`;
             }
         }
         if (i >= openai_msgs.length - 1 && count_view_mes > 8 && $.trim(item).substr(0, (name1 + ":").length) == name1 + ":") {//For add anchor in end