diff --git a/llamabot.js b/llamabot.js
index a67550a..3d03203 100644
--- a/llamabot.js
+++ b/llamabot.js
@@ -439,7 +439,7 @@ async function generateResponse(conversation, message) {
             let totalTokens = 0;
         
             for (const message of messages) {
-                if (message.role === 'user') {
+                if (message.role === 'user' || message.role === 'assistant') {
                     const encodedTokens = llamaTokenizer.encode(message.content);
                     totalTokens += encodedTokens.length;
                 }
@@ -453,7 +453,7 @@ async function generateResponse(conversation, message) {
         let tokenLength = totalTokens
 
         // Remove older conversations if necessary
-        const maxLength = 2048;
+        const maxLength = 2000;
         if (tokenLength > maxLength) {
             const diff = tokenLength - maxLength;
             let removedTokens = 0;