diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Switch.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Switch.java
index e4014d1a363bac10b5bb2311e6e4e5d99c495473..80da6c3dce01c1ad3e0c1f70958600eb8eb2dccf 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Switch.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Switch.java
@@ -116,6 +116,16 @@ public class Switch extends BControl {
 	protected Object readResolve() {
 		super.readResolve();
 		for (BControl control : getChildrenArray()) {
+			for (Track n : ((TrackNode) control).getSourceTracks()) {
+				AbstractAttribute a2 = n
+						.getAttribute(AttributeConstants.ATTRIBUTE_CUSTOM);
+				a2.setEditable(false);
+				if (a2.getValue().equals("LEFT")) {
+					track1 = n;
+				} else if (a2.getValue().equals("RIGHT")) {
+					track2 = n;
+				}
+			}
 			for (Track n : ((TrackNode) control).getTargetTracks()) {
 				AbstractAttribute a2 = n
 						.getAttribute(AttributeConstants.ATTRIBUTE_CUSTOM);