diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/DoubleInputField.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/DoubleInputField.java
index 0b9da46486606a56b7d5f5086bc8f350560ce023..1c3f1b19f9b3ae8b5fdc0b3ba364885702bcf91d 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/DoubleInputField.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/DoubleInputField.java
@@ -35,6 +35,6 @@ public class DoubleInputField extends JFormattedTextField{
 	}
 
 	public double getValueAsDouble() {
-		return Double.parseDouble(getText());
+		return (double)getValue();
 	}
 }
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/IntegerInputField.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/IntegerInputField.java
index cc6049e807c6f5e02286ce84d4b9f00ab65a13df..c9edadcfaa3769b13ea428050ea5ae210b8faeff 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/IntegerInputField.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/IntegerInputField.java
@@ -22,24 +22,31 @@
 package de.hhu.ba.yoshikoWrapper.gui;
 
 import javax.swing.JFormattedTextField;
+import javax.swing.text.NumberFormatter;
 
 /**
  * Provides a more strict input field that only accepts integers
  */
 @SuppressWarnings("serial")
 public class IntegerInputField extends JFormattedTextField{
+	
+	private final NumberFormatter formatter;
 
 	public IntegerInputField(int minValue, int maxValue) {
-		super(FormatHelper.getIntegerFormatter(minValue,maxValue));
+		super();
+		formatter = FormatHelper.getIntegerFormatter(minValue,maxValue);
+		this.setFormatter(formatter);
 		this.setColumns(8);
 	}
 
 	public IntegerInputField() {
-		super(FormatHelper.getIntegerFormatter());
+		super();
+		formatter = FormatHelper.getIntegerFormatter();
+		this.setFormatter(formatter);
 		this.setColumns(8);	
 	}
 
 	public int getValueAsInt() {
-		return Integer.parseInt(getText());
+		return (int) getValue();
 	}
 }