diff --git a/src/date_utils.js b/src/date_utils.js
index 26764ef..474c5c0 100644
--- a/src/date_utils.js
+++ b/src/date_utils.js
@@ -81,13 +81,21 @@ export default {
         };
 
         let str = format_string;
+        const formatted_values = [];
 
         Object.keys(format_map)
             .sort((a, b) => b.length - a.length) // big string first
             .forEach(key => {
-                str = str.replace(key, format_map[key]);
+                if (str.includes(key)) {
+                    str = str.replace(key, `$${formatted_values.length}`);
+                    formatted_values.push(format_map[key]);
+                }
             });
 
+        formatted_values.forEach((value, i) => {
+            str = str.replace(`$${i}`, value);
+        });
+
         return str;
     },