diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp
index 7e616c63a..44fd389e0 100644
--- a/src/Base/UnitsSchemaInternal.cpp
+++ b/src/Base/UnitsSchemaInternal.cpp
@@ -88,9 +88,12 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
             unitString = QString::fromLatin1("kPa");
             factor = 1.0;
         }else if(UnitValue < 10000000.0){
-            unitString = QString::fromLatin1("GPa");
+            unitString = QString::fromLatin1("MPa");
             factor = 1000.0;
-        }else{ // bigger then 1000 GPa -> scientific notation 
+        }else if(UnitValue < 10000000000.0){
+            unitString = QString::fromLatin1("GPa");
+            factor = 1000000.0;
+        }else{ // bigger -> scientific notation 
             unitString = QString::fromLatin1("Pa");
             factor = 1.0;
         }