diff --git a/src/Template.js b/src/Template.js
index ee7ab3f..c33280c 100644
--- a/src/Template.js
+++ b/src/Template.js
@@ -270,7 +270,7 @@ class Template extends EventEmitter
         {
             let value = this._getVariable(res[1], pData);
             if(pEscapeString&& (typeof value )== "string")
-                value = "'"+value+"'";
+                value = "'"+value.replace(/\'/g, "\\'")+"'";
             pString = pString.replace(res[0], value);
         }
         return pString;
diff --git a/src/es5.Template.js b/src/es5.Template.js
index b37854f..d4a3793 100644
--- a/src/es5.Template.js
+++ b/src/es5.Template.js
@@ -251,7 +251,7 @@ Class.define(Template, [EventDispatcher],
 		{
 			value = this._getVariable(res[1], pData);
 			if(pEscapeString&& (typeof value )== "string")
-				value = "'"+value+"'";
+				value = "'"+value.replace(/\'/g, "\\'")+"'";
 			pString = pString.replace(res[0], value);
 		}
 		return pString;