diff --git a/src/canvas.class.js b/src/canvas.class.js
index fc62aeae..32cfdd6b 100644
--- a/src/canvas.class.js
+++ b/src/canvas.class.js
@@ -649,7 +649,7 @@
         angle = 360 + angle;
       }
 
-      t.target.angle = angle;
+      t.target.angle = angle % 360;
     },
 
     /**
diff --git a/src/shapes/object.class.js b/src/shapes/object.class.js
index e743909e..81234cf0 100644
--- a/src/shapes/object.class.js
+++ b/src/shapes/object.class.js
@@ -1061,10 +1061,12 @@
         return;
       }
 
+      var mult = this.canvas._currentMultiplier || 1;
+
       ctx.shadowColor = this.shadow.color;
-      ctx.shadowBlur = this.shadow.blur;
-      ctx.shadowOffsetX = this.shadow.offsetX;
-      ctx.shadowOffsetY = this.shadow.offsetY;
+      ctx.shadowBlur = this.shadow.blur * mult * (this.scaleX + this.scaleY) / 2;
+      ctx.shadowOffsetX = this.shadow.offsetX * mult * this.scaleX;
+      ctx.shadowOffsetY = this.shadow.offsetY * mult * this.scaleY;
     },
 
     /**