diff --git a/dist/iwmlib.js b/dist/iwmlib.js
index a731c16..fedc6d9 100644
--- a/dist/iwmlib.js
+++ b/dist/iwmlib.js
@@ -2619,8 +2619,8 @@
             if (Events.isCaptured(event)) {
                 return false
             }
-            let captured = this.target.capture(event);
-            return captured
+
+            return this.target.capture ? this.target.capture(event) : false
         }
 
         getPosition(event) {
@@ -3218,6 +3218,9 @@
             let t = performance.now();
             let dt = t - this.lastframe;
             this.lastframe = t;
+
+            // When number is not set or is zero. Use one instead.
+            let number = delta.number ? delta.number : 1;
             if (dt > 0) {
                 // Avoid division by zero errors later on
                 // and consider the number of involved pointers sind addVelocity will be called by the
@@ -3225,13 +3228,14 @@
                 let velocity = {
                     t: t,
                     dt: dt,
-                    dx: delta.x / delta.number,
-                    dy: delta.y / delta.number
+                    dx: delta.x / number,
+                    dy: delta.y / number
                 };
                 this.velocities.push(velocity);
                 while (this.velocities.length > buffer) {
                     this.velocities.shift();
                 }
+
             }
         }
 
@@ -3479,7 +3483,6 @@
             let delta = interaction.delta();
 
             if (delta != null) {
-                this.addVelocity(delta);
                 let rotate = delta.rotate;
                 let zoom = delta.zoom;
                 if (this.maxRotation != null) {
@@ -3679,6 +3682,7 @@
         }
 
         _move(delta) {
+            this.addVelocity(delta);
             this.x += this.movableX ? delta.x : 0;
             this.y += this.movableX ? delta.y : 0;
         }
@@ -4493,7 +4497,8 @@
             }
             this._x = x;
             this._y = y;
-            TweenLite.set(this.element, { x: x, y: y });
+            this.addVelocity({ x: delta.x, y: delta.y });
+            TweenLite.set(this.element, { x, y });
         }
 
         resizeAfterTransform(zoom) {
diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js
index 1e8ba60..b6fb541 100644
--- a/dist/iwmlib.pixi.js
+++ b/dist/iwmlib.pixi.js
@@ -6178,8 +6178,8 @@
             if (Events$1.isCaptured(event)) {
                 return false
             }
-            let captured = this.target.capture(event);
-            return captured
+
+            return this.target.capture ? this.target.capture(event) : false
         }
 
         getPosition(event) {
@@ -6768,6 +6768,9 @@
             let t = performance.now();
             let dt = t - this.lastframe;
             this.lastframe = t;
+
+            // When number is not set or is zero. Use one instead.
+            let number = delta.number ? delta.number : 1;
             if (dt > 0) {
                 // Avoid division by zero errors later on
                 // and consider the number of involved pointers sind addVelocity will be called by the
@@ -6775,13 +6778,14 @@
                 let velocity = {
                     t: t,
                     dt: dt,
-                    dx: delta.x / delta.number,
-                    dy: delta.y / delta.number
+                    dx: delta.x / number,
+                    dy: delta.y / number
                 };
                 this.velocities.push(velocity);
                 while (this.velocities.length > buffer) {
                     this.velocities.shift();
                 }
+
             }
         }
 
@@ -7029,7 +7033,6 @@
             let delta = interaction.delta();
 
             if (delta != null) {
-                this.addVelocity(delta);
                 let rotate = delta.rotate;
                 let zoom = delta.zoom;
                 if (this.maxRotation != null) {
@@ -7229,6 +7232,7 @@
         }
 
         _move(delta) {
+            this.addVelocity(delta);
             this.x += this.movableX ? delta.x : 0;
             this.y += this.movableX ? delta.y : 0;
         }
@@ -7863,7 +7867,8 @@
             }
             this._x = x;
             this._y = y;
-            TweenLite.set(this.element, { x: x, y: y });
+            this.addVelocity({ x: delta.x, y: delta.y });
+            TweenLite.set(this.element, { x, y });
         }
 
         resizeAfterTransform(zoom) {