diff --git a/README.md b/README.md
index 01845106..e75e8fd6 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
 30.03.2020
 
 - working to update the Paint Tool
+- fixed some issues in Paint Tool
 
 29.03.2020
 
diff --git a/flatcamTools/ToolPaint.py b/flatcamTools/ToolPaint.py
index 51e6c9e3..9cf45655 100644
--- a/flatcamTools/ToolPaint.py
+++ b/flatcamTools/ToolPaint.py
@@ -984,9 +984,9 @@ class ToolPaint(FlatCAMTool, Gerber):
         self.default_data.update({
             "name": '_paint',
             "plot": self.app.defaults["geometry_plot"],
-            "cutz": float(self.cutz_entry.get_value()),
-            "vtipdia": float(self.tipdia_entry.get_value()),
-            "vtipangle": float(self.tipangle_entry.get_value()),
+            "cutz": float(self.app.defaults["tools_paintcutz"],),
+            "vtipdia": float(self.app.defaults["tools_painttipdia"],),
+            "vtipangle": float(self.app.defaults["tools_painttipangle"],),
             "travelz": float(self.app.defaults["geometry_travelz"]),
             "feedrate": float(self.app.defaults["geometry_feedrate"]),
             "feedrate_z": float(self.app.defaults["geometry_feedrate_z"]),