diff --git a/src/Base/Writer.cpp b/src/Base/Writer.cpp
index b89c12e0ee..0f5a0c48d6 100644
--- a/src/Base/Writer.cpp
+++ b/src/Base/Writer.cpp
@@ -37,6 +37,7 @@
 
 #include <algorithm>
 #include <locale>
+#include <limits>
 
 using namespace Base;
 using namespace std;
@@ -248,7 +249,7 @@ ZipWriter::ZipWriter(const char* FileName)
     //FIXME: Check whether this is correct
     ZipStream.imbue(std::locale::classic());
 #endif
-    ZipStream.precision(16);
+    ZipStream.precision(std::numeric_limits<double>::digits10 + 1);
     ZipStream.setf(ios::fixed,ios::floatfield);
 }
 
@@ -261,7 +262,7 @@ ZipWriter::ZipWriter(std::ostream& os)
     //FIXME: Check whether this is correct
     ZipStream.imbue(std::locale::classic());
 #endif
-    ZipStream.precision(16);
+    ZipStream.precision(std::numeric_limits<double>::digits10 + 1);
     ZipStream.setf(ios::fixed,ios::floatfield);
 }
 
diff --git a/src/Gui/DlgSettingsUnitsImp.cpp b/src/Gui/DlgSettingsUnitsImp.cpp
index a4a491944c..171f0f0a09 100644
--- a/src/Gui/DlgSettingsUnitsImp.cpp
+++ b/src/Gui/DlgSettingsUnitsImp.cpp
@@ -27,6 +27,8 @@
 # include <QRegExp>
 #endif
 
+#include <limits>
+
 #include "ui_DlgSettingsUnits.h"
 #include "DlgSettingsUnitsImp.h"
 #include "NavigationStyle.h"
@@ -49,6 +51,7 @@ DlgSettingsUnitsImp::DlgSettingsUnitsImp(QWidget* parent)
     : PreferencePage( parent ), ui(new Ui_DlgSettingsUnits)
 {
     ui->setupUi(this);
+    ui->spinBoxDecimals->setMaximum(std::numeric_limits<double>::digits10 + 1);
 
     //fillUpListBox();
     ui->tableWidget->setVisible(false);