diff --git a/src/tec/letsgoing/ardublock/simulator/Simulator.java b/src/tec/letsgoing/ardublock/simulator/Simulator.java
index bd49df03f03292bae7bba16791179601d09f1d13..51235adb0e57324d5b66d08a005497962ea151b5 100644
--- a/src/tec/letsgoing/ardublock/simulator/Simulator.java
+++ b/src/tec/letsgoing/ardublock/simulator/Simulator.java
@@ -3,6 +3,7 @@
  */
 package tec.letsgoing.ardublock.simulator;
 
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
@@ -110,10 +111,14 @@ public class Simulator implements Runnable, ActionListener {
 				arduino.errorAbort("Thread Überwachung gestört - Bitte Programm neustarten");
 			}
 		}
+		Point locationWindow;
+		locationWindow=gui.getLocation();
+
 		gui.stopThread();
 		gui.dispose();
 
 		createSubClasses();
+		gui.setLocation(locationWindow);
 		for (SimCodeFunction function : functionsCode) {
 			arduino.addFunction(function);
 		}
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java b/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
index f1a19e3203250afc5a37e1385429e4b56379ed33..d1f0662813206c88324a87714e50cc33d8e1d219 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
@@ -11,6 +11,7 @@ import java.util.Observer;
  *
  */
 public class Pin extends Observable {
+	//FIXME Java 8 oder 11?
 	private int value = 0;
 	private boolean mode = false; // false == Input, true==Output
 
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
index 5a81295d431a27d10d38e71c26bfcbddd4bf2194..092a23ecdfb071b0ee132c92809c8be568ecacb7 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
@@ -69,11 +69,9 @@ public class Button extends Modul implements ActionListener {
 
 	public void updateModul(Pin pin) {
 		int pinNumber = 0;
-		if (pin == pins.get(0))
-			pinNumber = 0;
 		if (pin == pins.get(1))
 			pinNumber = 1;
-		if (pin == pins.get(2))
+		else if (pin == pins.get(2))
 			pinNumber = 2;
 		if (pins.get(pinNumber).getValue() != lastState[pinNumber]) {
 			pins.get(pinNumber).setValue(lastState[pinNumber]);