diff --git a/src/api.ts b/src/api.ts
index bb30b3a..cfefec2 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -454,11 +454,14 @@ function extractConversationResult(conversationMapping: Record<string, Conversat
             break // Node not found
         }
 
-        if (node.message?.author.role === 'system') {
-            break // Stop at system message
+        if (node.parent === undefined) {
+            break // Stop at root message.
+        }
+
+        if (node.message?.author.role !== 'system') { // Skip system messages
+            result.unshift(node)
         }
 
-        result.unshift(node)
         currentNodeId = node.parent
     }
 
diff --git a/src/utils/conversion.ts b/src/utils/conversion.ts
index 282c3ea..095f574 100644
--- a/src/utils/conversion.ts
+++ b/src/utils/conversion.ts
@@ -33,8 +33,8 @@ function convertMessageToTavern(node: ConversationNode): TavernMessage | null {
     return {
         name: authorRole === 'assistant' ? 'Assistant' : 'You',
         is_user: authorRole === 'user',
-        // This seems to be always true
-        is_name: true,
+        // This is the opposite of is_user! Not always true.
+        is_name: authorRole === 'assistant',
         send_date: createTime,
         mes: text,
         swipes: [text],