diff --git a/src/main/java/ch/psi/mxsc/PuckGraphics.java b/src/main/java/ch/psi/mxsc/PuckGraphics.java
index 24e0dfe..8cc7c72 100644
--- a/src/main/java/ch/psi/mxsc/PuckGraphics.java
+++ b/src/main/java/ch/psi/mxsc/PuckGraphics.java
@@ -249,9 +249,9 @@ public class PuckGraphics {
             position = getReferenceDrawPosition();
             size = getReferenceDrawSize();   
             //size+=1;
-            g.fillArc(position.x - size / 2, position.y - size / 2 , size, size, (int) (180 + puck.angle), 180);   
+            g.fillArc(position.x - size / 2, position.y - size / 2 , size, size, (int) (180 + (rotated  ? puck.angle : 0)), 180);   
             g.setColor(getBorderColor(drawBackground));
-            g.drawArc(position.x - size / 2, position.y - size / 2 , size, size, (int) (180 + puck.angle), 180);   
+            g.drawArc(position.x - size / 2, position.y - size / 2 , size, size, (int) (180 + (rotated  ? puck.angle : 0)), 180);   
         } else {
             Point pu = getDrawUnipuckLedPosition();
             Point pm = getDrawMinispineLedPosition();