diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
index 04b51cfea8d3bc1a7f1e88f1c47351fe4167061d..61dda3980cd3fb1ee3e31fd715caab293a711c81 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
@@ -53,7 +53,7 @@ public class ScatterChart01 implements ExampleChart {
     int size = 1000;
     for (int i = 0; i < size; i++) {
       xData.add(random.nextGaussian());
-      yData.add(-100 + random.nextGaussian());
+      yData.add(-1000000 + random.nextGaussian());
     }
 
     // Create Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/Series.java b/xchart/src/main/java/com/xeiam/xchart/Series.java
index 285720302940f4cac2f0227311238ba966aa61c7..3b0c2acb6b3af05c842a6bc8e68227156d1a8ad1 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Series.java
+++ b/xchart/src/main/java/com/xeiam/xchart/Series.java
@@ -107,7 +107,7 @@ public class Series {
   private double[] findMinMax(Collection<?> data, AxisType axisType) {
 
     double min = Double.MAX_VALUE;
-    double max = Double.MIN_VALUE;
+    double max = -Double.MAX_VALUE;
 
     for (Object dataPoint : data) {
 
@@ -119,7 +119,6 @@ public class Series {
 
       if (axisType == AxisType.Number) {
         value = ((Number) dataPoint).doubleValue();
-
       }
       else if (axisType == AxisType.Date) {
         Date date = (Date) dataPoint;
@@ -148,7 +147,7 @@ public class Series {
   private double[] findMinMaxWithErrorBars(Collection<? extends Number> data, Collection<? extends Number> errorBars) {
 
     double min = Double.MAX_VALUE;
-    double max = Double.MIN_VALUE;
+    double max = -Double.MAX_VALUE;
 
     Iterator<? extends Number> itr = data.iterator();
     Iterator<? extends Number> ebItr = errorBars.iterator();
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
index 6c79c5f74d871c0a23f5bb80cf96946337dbc5af..fa80957328352078e9578269eea1d61aedd14ef8 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
@@ -89,7 +89,7 @@ public class Axis implements ChartPart {
   void resetMinMax() {
 
     min = Double.MAX_VALUE;
-    max = Double.MIN_VALUE;
+    max = -Double.MAX_VALUE;
   }
 
   /**