diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
index 0cab9ca47fd694edf35d8475086a3432a608650d..a3c0bd4c9b00b01489fae3dcdfcb1b2565a349e4 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
@@ -56,7 +56,7 @@ public class ScatterChart02 implements ExampleChart {
     for (int i = 0; i < size; i++) {
       double nextRandom = random.nextDouble();
       xData.add(Math.pow(10, nextRandom * 10));
-      yData.add(1000000000.0 + nextRandom * 100);
+      yData.add(1000000000.0 + nextRandom);
     }
 
     // Create Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
index 3fd3da4b302c334598fcf6b20466773db2e79012..d58db61a83729dd18ef060691eedb96412969b90 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
@@ -77,10 +77,10 @@ public class NumberFormatter {
     StringBuilder sb = new StringBuilder();
     for (int i = maxNumPlaces - 1; i >= -1 * maxNumPlaces; i--) {
 
-      if (i >= 0 && (i < placeOfValue && i >= placeOfDifference)) {
+      if (i >= 0 && (i < placeOfValue)) {
         sb.append("0");
       }
-      else if (i < 0 && (i > placeOfValue && i >= placeOfDifference)) {
+      else if (i < 0 && (i > placeOfValue)) {
         sb.append("0");
       }
       else {
@@ -99,7 +99,7 @@ public class NumberFormatter {
 
   private String getScientificDecimalPattern() {
 
-    return "0E0";
+    return "0.###############E0";
   }
 
   /**