diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index 119c72025..3f4739976 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -244,11 +244,8 @@ module.exports = Backbone.View.extend({
       this.getJsContainer().append(view.scriptContainer.get(0));
     }
 
-    var id = view.model.cid;
-    var script = view.model.get('script');
-    var scrStr = 'function(){' + script + '}';
-    scrStr = typeof script == 'function' ? script.toString() : scrStr;
-
+    var model = view.model;
+    var id = model.cid;
     view.el.id = id;
     view.scriptContainer.html('');
 
@@ -258,7 +255,7 @@ module.exports = Backbone.View.extend({
         setTimeout(function() {
           var item = document.getElementById('${id}');
           if (!item) return;
-          (${scrStr}.bind(item))()
+          (function(){${model.getScriptString()}}.bind(item))()
         }, 1);
       </script>`);
   },
diff --git a/src/code_manager/model/JsGenerator.js b/src/code_manager/model/JsGenerator.js
index e6dc20440..465396f69 100644
--- a/src/code_manager/model/JsGenerator.js
+++ b/src/code_manager/model/JsGenerator.js
@@ -15,8 +15,9 @@ module.exports = Backbone.Model.extend({
       attr = _.extend({}, attr, {id});
       model.set('attributes', attr);
 
-      var scrStr = 'function(){' + script + '}';
-      scrStr = typeof script == 'function' ? script.toString() : scrStr;
+      //var scrStr = 'function(){' + script + '}';
+      //scrStr = typeof script == 'function' ? script.toString() : scrStr;
+      var scrStr = model.getScriptString();
 
       // If the script was updated, I'll put its code in a separate container
       if (model.get('scriptUpdated')) {