diff --git a/src/FixedDataTable.js b/src/FixedDataTable.js
index 2cc039d5..d78ea3ce 100644
--- a/src/FixedDataTable.js
+++ b/src/FixedDataTable.js
@@ -1113,7 +1113,7 @@ class FixedDataTable extends React.Component {
   /**
    * Calls the user specified scroll callbacks -- onScrollStart, onScrollEnd, onHorizontalScroll, and onVerticalScroll.
    */
-  _didScroll = (/* !object */ nextProps) => {
+  _didScroll = (/* !object */ prevProps) => {
     const {
       onScrollStart,
       scrollX,
@@ -1121,7 +1121,7 @@ class FixedDataTable extends React.Component {
       onHorizontalScroll,
       onVerticalScroll,
       tableSize: { ownerHeight },
-    } = nextProps;
+    } = this.props;
 
     const {
       endRowIndex: oldEndRowIndex,
@@ -1129,7 +1129,7 @@ class FixedDataTable extends React.Component {
       scrollX: oldScrollX,
       scrollY: oldScrollY,
       tableSize: { ownerHeight: oldOwnerHeight },
-    } = this.props;
+    } = prevProps;
 
     // check if scroll values have changed - we have an extra check on NaN because (NaN !== NaN)
     const ownerHeightChanged = ownerHeight !== oldOwnerHeight && !(isNaN(ownerHeight) && isNaN(oldOwnerHeight));
diff --git a/src/FixedDataTableContainer.js b/src/FixedDataTableContainer.js
index 26e2e2f9..269ad6a9 100644
--- a/src/FixedDataTableContainer.js
+++ b/src/FixedDataTableContainer.js
@@ -68,8 +68,8 @@ class FixedDataTableContainer extends React.Component {
   render() {
     return (
       <FixedDataTable
-        {...this.props}
         {...this.state}
+        {...this.props}
         scrollActions={this.scrollActions}
         columnActions={this.columnActions}
       />
diff --git a/src/FixedDataTableStore.js b/src/FixedDataTableStore.js
index d9222629..156a2be3 100644
--- a/src/FixedDataTableStore.js
+++ b/src/FixedDataTableStore.js
@@ -15,7 +15,5 @@ import reducers from 'reducers'
 import { createStore } from 'redux'
 
 export default {
-  get: () => {
-    return createStore(reducers)
-  },
+  get: () => createStore(reducers)
 };