diff --git a/src/interface.jl b/src/interface.jl
index bf86c1c..2415b16 100644
--- a/src/interface.jl
+++ b/src/interface.jl
@@ -90,9 +90,9 @@ function generatePrompt_tokenSuffix(a::agent;
     if role == "system"
       prompt = replace(systemToken, "content" => content) * " "
     elseif role == "user"
-      prompt *= " " * content * userToken
+      prompt *= " " * content * " " * userToken
     elseif role == "assistant"
-      prompt *= " " * content * assistantToken
+      prompt *= " " * content * " " * assistantToken
     else
       error("undefied condition role = $role")
     end
@@ -112,9 +112,9 @@ function generatePrompt_tokenPrefix(a::agent;
     if role == "system"
       prompt = replace(systemToken, "content" => content) * " "
     elseif role == "user"
-      prompt *= userToken * content * " "
+      prompt *= userToken * " " * content * " "
     elseif role == "assistant"
-      prompt *= assistantToken * content * " "
+      prompt *= assistantToken * " " * content * " "
     else
       error("undefied condition role = $role")
     end