diff --git a/package.json b/package.json
index b370036..ae2805e 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "ScrollArea component for react",
   "main": "./dist/scrollArea.js",
   "scripts": {
-    "test": "./node_modules/.bin/karma start karma.config.js --single-run --browsers PhantomJS"
+    "test": "./node_modules/.bin/karma start karma.config.js --single-run --browsers PhantomJS",
+    "build": "gulp build"
   },
   "repository": {
     "type": "git",
diff --git a/src/js/ScrollArea.jsx b/src/js/ScrollArea.jsx
index ffe3484..74670a0 100644
--- a/src/js/ScrollArea.jsx
+++ b/src/js/ScrollArea.jsx
@@ -217,9 +217,17 @@ export default class ScrollArea extends React.Component {
     }
 
     handleTouchEnd(e) {
-        let {deltaX, deltaY, timestamp} = this.eventPreviousValues;
+        let deltaX,
+          deltaY,
+          timestamp;
+        if (this.eventPreviousValues) {
+            deltaX = this.eventPreviousValues.deltaX;
+            deltaY = this.eventPreviousValues.deltaY;
+            timestamp = this.eventPreviousValues.timestamp;
+        }
         if (typeof deltaX === 'undefined') deltaX = 0;
         if (typeof deltaY === 'undefined') deltaY = 0;
+        if (typeof timestamp === 'undefined') timestamp = Date.now();
         if (Date.now() - timestamp < 200) {
             this.setStateFromEvent(this.composeNewState(-deltaX * 10, -deltaY * 10), eventTypes.touchEnd);
         }