diff --git a/src/main/java/schule/ngb/zm/shapes/Shape.java b/src/main/java/schule/ngb/zm/shapes/Shape.java
index e009fed..a0dad46 100644
--- a/src/main/java/schule/ngb/zm/shapes/Shape.java
+++ b/src/main/java/schule/ngb/zm/shapes/Shape.java
@@ -325,8 +325,8 @@ public abstract class Shape extends BasicDrawable {
 			setStrokeWeight(shape.getStrokeWeight());
 			setStrokeType(shape.getStrokeType());
 			visible = shape.isVisible();
-			rotation = shape.rotation;
-			scale(shape.scale);
+			rotation = shape.getRotation();
+			scale(shape.getScale());
 			setAnchor(shape.getAnchor());
 		}
 	}
diff --git a/src/main/java/schule/ngb/zm/shapes/Text.java b/src/main/java/schule/ngb/zm/shapes/Text.java
index c3b7373..348b9cb 100644
--- a/src/main/java/schule/ngb/zm/shapes/Text.java
+++ b/src/main/java/schule/ngb/zm/shapes/Text.java
@@ -181,13 +181,13 @@ public class Text extends Shape {
 
 	@Override
 	public void copyFrom( Shape shape ) {
-		super.copyFrom(shape);
 		if( shape instanceof Text ) {
 			Text pText = (Text) shape;
 			this.text = pText.getText();
 			this.font = pText.getFont();
-			calculateBounds();
 		}
+		super.copyFrom(shape);
+		calculateBounds();
 	}
 
 	@Override