diff --git a/addon/classes/Column.js b/addon/classes/Column.js
index 5cdaa929..9514944b 100644
--- a/addon/classes/Column.js
+++ b/addon/classes/Column.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import fixProto from 'ember-light-table/utils/fix-proto';
 
 const {
   guidFor,
@@ -344,3 +345,6 @@ export default class Column extends EmberObject.extend({
     this.set('subColumns', subColumns);
   }
 }
+
+// https://github.com/offirgolan/ember-light-table/issues/436#issuecomment-310138868
+fixProto(Column);
diff --git a/addon/classes/Row.js b/addon/classes/Row.js
index c492c5c0..95847cce 100644
--- a/addon/classes/Row.js
+++ b/addon/classes/Row.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import fixProto from 'ember-light-table/utils/fix-proto';
 
 const {
   computed,
@@ -100,3 +101,6 @@ export default class Row extends ObjectProxy.extend({
     this.set('content', content);
   }
 }
+
+// https://github.com/offirgolan/ember-light-table/issues/436#issuecomment-310138868
+fixProto(Row);
diff --git a/addon/classes/Table.js b/addon/classes/Table.js
index 8cd8be49..f3db12c6 100644
--- a/addon/classes/Table.js
+++ b/addon/classes/Table.js
@@ -3,6 +3,7 @@ import Row from 'ember-light-table/classes/Row';
 import Column from 'ember-light-table/classes/Column';
 import SyncArrayProxy from 'ember-light-table/-private/sync-array-proxy';
 import { mergeOptionsWithGlobals } from 'ember-light-table/-private/global-options';
+import fixProto from 'ember-light-table/utils/fix-proto';
 
 const {
   get,
@@ -425,3 +426,6 @@ export default class Table extends EmberObject.extend({
     return columns.map((c) => Table.createColumn(c));
   }
 }
+
+// https://github.com/offirgolan/ember-light-table/issues/436#issuecomment-310138868
+fixProto(Table);