diff --git a/HISTORY.md b/HISTORY.md
index c6473cdd..3e3884cc 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -9,6 +9,7 @@ http://visjs.org
 - Fixed scaling not doing anything to edges.
 - Fixed setting font to null so the network won't crash anymore.
 - Fixed stabilized event not firing if layout algorithm does very well.
+- Fixed arrows with some shapes when they are selected. #1292
 
 ## 2015-09-07, version 4.8.1
 
diff --git a/dist/vis.js b/dist/vis.js
index f9af6577..ca2cb679 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -29073,8 +29073,9 @@ return /******/ (function(modules) { // webpackBootstrap
       }
     }, {
       key: '_distanceToBorder',
-      value: function _distanceToBorder(angle) {
+      value: function _distanceToBorder(ctx, angle) {
         var borderWidth = 1;
+        this.resize(ctx);
         return Math.min(Math.abs(this.width / 2 / Math.cos(angle)), Math.abs(this.height / 2 / Math.sin(angle))) + borderWidth;
       }
     }, {
@@ -29659,7 +29660,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
-        return this._distanceToBorder(angle);
+        return this._distanceToBorder(ctx, angle);
       }
     }]);
 
@@ -29821,6 +29822,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
+        this.resize(ctx);
         return this.options.size + this.options.borderWidth;
       }
     }]);
@@ -30197,8 +30199,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
-        this.resize();
-        return this._distanceToBorder(angle);
+        return this._distanceToBorder(ctx, angle);
       }
     }]);
 
@@ -30254,7 +30255,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
-        return this._distanceToBorder(angle);
+        return this._distanceToBorder(ctx, angle);
       }
     }]);
 
@@ -30397,7 +30398,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
-        return this._distanceToBorder(angle);
+        return this._distanceToBorder(ctx, angle);
       }
     }]);
 
@@ -30453,7 +30454,7 @@ return /******/ (function(modules) { // webpackBootstrap
     }, {
       key: 'distanceToBorder',
       value: function distanceToBorder(ctx, angle) {
-        return this._distanceToBorder(angle);
+        return this._distanceToBorder(ctx, angle);
       }
     }]);
 
diff --git a/lib/network/modules/components/nodes/shapes/Diamond.js b/lib/network/modules/components/nodes/shapes/Diamond.js
index 15d348bf..9a72caaa 100644
--- a/lib/network/modules/components/nodes/shapes/Diamond.js
+++ b/lib/network/modules/components/nodes/shapes/Diamond.js
@@ -16,7 +16,7 @@ class Diamond extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
-    return this._distanceToBorder(angle);
+    return this._distanceToBorder(ctx,angle);
   }
 }
 
diff --git a/lib/network/modules/components/nodes/shapes/Dot.js b/lib/network/modules/components/nodes/shapes/Dot.js
index 28fb920c..54be7864 100644
--- a/lib/network/modules/components/nodes/shapes/Dot.js
+++ b/lib/network/modules/components/nodes/shapes/Dot.js
@@ -16,6 +16,7 @@ class Dot extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
+    this.resize(ctx);
     return this.options.size + this.options.borderWidth;
   }
 }
diff --git a/lib/network/modules/components/nodes/shapes/Square.js b/lib/network/modules/components/nodes/shapes/Square.js
index 80024615..e2fc6ebb 100644
--- a/lib/network/modules/components/nodes/shapes/Square.js
+++ b/lib/network/modules/components/nodes/shapes/Square.js
@@ -16,8 +16,7 @@ class Square extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
-    this.resize();
-    return this._distanceToBorder(angle);
+    return this._distanceToBorder(ctx,angle);
   }
 }
 
diff --git a/lib/network/modules/components/nodes/shapes/Star.js b/lib/network/modules/components/nodes/shapes/Star.js
index df23b458..4aae4fae 100644
--- a/lib/network/modules/components/nodes/shapes/Star.js
+++ b/lib/network/modules/components/nodes/shapes/Star.js
@@ -16,7 +16,7 @@ class Star extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
-    return this._distanceToBorder(angle);
+    return this._distanceToBorder(ctx,angle);
   }
 }
 
diff --git a/lib/network/modules/components/nodes/shapes/Triangle.js b/lib/network/modules/components/nodes/shapes/Triangle.js
index c8aac1d7..6c58a4f1 100644
--- a/lib/network/modules/components/nodes/shapes/Triangle.js
+++ b/lib/network/modules/components/nodes/shapes/Triangle.js
@@ -16,7 +16,7 @@ class Triangle extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
-    return this._distanceToBorder(angle);
+    return this._distanceToBorder(ctx,angle);
   }
 }
 
diff --git a/lib/network/modules/components/nodes/shapes/TriangleDown.js b/lib/network/modules/components/nodes/shapes/TriangleDown.js
index 6b64f595..044fd7c5 100644
--- a/lib/network/modules/components/nodes/shapes/TriangleDown.js
+++ b/lib/network/modules/components/nodes/shapes/TriangleDown.js
@@ -16,7 +16,7 @@ class TriangleDown extends ShapeBase {
   }
 
   distanceToBorder(ctx, angle) {
-    return this._distanceToBorder(angle);
+    return this._distanceToBorder(ctx,angle);
   }
 }
 
diff --git a/lib/network/modules/components/nodes/util/NodeBase.js b/lib/network/modules/components/nodes/util/NodeBase.js
index a5f74167..a497a989 100644
--- a/lib/network/modules/components/nodes/util/NodeBase.js
+++ b/lib/network/modules/components/nodes/util/NodeBase.js
@@ -15,8 +15,9 @@ class NodeBase {
     this.options = options;
   }
 
-  _distanceToBorder(angle) {
+  _distanceToBorder(ctx,angle) {
     var borderWidth = 1;
+    this.resize(ctx);
     return Math.min(
         Math.abs(this.width / 2 / Math.cos(angle)),
         Math.abs(this.height / 2 / Math.sin(angle))) + borderWidth;