diff --git a/src/server/i18n.cpp b/src/server/i18n.cpp
index 0a2cd8c73..5b948f26e 100644
--- a/src/server/i18n.cpp
+++ b/src/server/i18n.cpp
@@ -112,8 +112,12 @@ std::string expandParameterizedString(const std::string& lang,
                                       const std::string& key,
                                       const Parameters& params)
 {
+  kainjow::mustache::object mustacheParams;
+  for( const auto& kv : params ) {
+    mustacheParams[kv.first] = kv.second;
+  }
   const std::string tmpl = getTranslatedString(lang, key);
-  return render_template(tmpl, params);
+  return render_template(tmpl, mustacheParams);
 }
 
 } // namespace i18n
diff --git a/src/server/i18n.h b/src/server/i18n.h
index 36d4b955b..7eeb0205a 100644
--- a/src/server/i18n.h
+++ b/src/server/i18n.h
@@ -20,6 +20,7 @@
 #ifndef KIWIX_SERVER_I18N
 #define KIWIX_SERVER_I18N
 
+#include <map>
 #include <string>
 #include <mustache.hpp>
 
@@ -44,7 +45,7 @@ std::string getTranslatedString(const std::string& lang, const std::string& key)
 namespace i18n
 {
 
-typedef kainjow::mustache::object Parameters;
+typedef std::map<std::string, std::string> Parameters;
 
 std::string expandParameterizedString(const std::string& lang,
                                       const std::string& key,
@@ -96,7 +97,7 @@ private:
 class ParameterizedMessage
 {
 public: // types
-  typedef kainjow::mustache::object Parameters;
+  typedef i18n::Parameters Parameters;
 
 public: // functions
   ParameterizedMessage(const std::string& msgId, const Parameters& params)