diff --git a/src/directives/ng-cell.js b/src/directives/ng-cell.js
index 774e74be53..e7d231f168 100644
--- a/src/directives/ng-cell.js
+++ b/src/directives/ng-cell.js
@@ -5,11 +5,11 @@
             return {
                 pre: function($scope, iElement) {
                     var html;
-                    var cellTemplate = $scope.col.cellTemplate.replace(COL_FIELD, '$eval(\'row.entity.\' + col.field)');
+                    var cellTemplate = $scope.col.cellTemplate.replace(COL_FIELD, 'row.entity.' + $scope.col.field);
 					if($scope.col.enableCellEdit){
 						html =  $scope.col.cellEditTemplate;
 						html = html.replace(DISPLAY_CELL_TEMPLATE, cellTemplate);
-						html = html.replace(EDITABLE_CELL_TEMPLATE, $scope.col.editableCellTemplate.replace(COL_FIELD, '$eval(\'row.entity.\' + col.field)'));
+						html = html.replace(EDITABLE_CELL_TEMPLATE, $scope.col.editableCellTemplate.replace(COL_FIELD, 'row.entity.' + $scope.col.field));
 					} else {
 					    html = cellTemplate;
 					}
diff --git a/src/templates/editableCellTemplate.html b/src/templates/editableCellTemplate.html
index baa51b528c..8b73dbc3b8 100644
--- a/src/templates/editableCellTemplate.html
+++ b/src/templates/editableCellTemplate.html
@@ -1 +1 @@
-<input ng-class="'colt' + col.index" ng-input="COL_FIELD" />
\ No newline at end of file
+<input ng-class="'colt' + col.index" ng-input="COL_FIELD" ng-model="COL_FIELD" />
\ No newline at end of file