diff --git a/xchart/src/main/java/com/xeiam/xchart/Histogram.java b/xchart/src/main/java/com/xeiam/xchart/Histogram.java
index fa307af367129efd619afa36deb23b0f3b616a92..a55718700f77e9804663f5678cfe3944b898f366 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Histogram.java
+++ b/xchart/src/main/java/com/xeiam/xchart/Histogram.java
@@ -45,7 +45,7 @@ public class Histogram {
     this.numBins = numBins;
     this.originalData = data;
 
-    Double tempMax = Double.MIN_VALUE;
+    Double tempMax = -Double.MAX_VALUE;
     Double tempMin = Double.MAX_VALUE;
     for (Number number : data) {
       double value = number.doubleValue();
diff --git a/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java b/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
index ebe3a080c2b43e52765122ecd8e418a1d24b67da..2ca2d701b5cc372f5b8ce389e7f4af3cfa7955f8 100644
--- a/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
@@ -16,9 +16,7 @@
 package com.xeiam.xchart;
 
 import static org.fest.assertions.api.Assertions.assertThat;
-
 import java.util.Arrays;
-
 import org.junit.Test;
 
 /**
@@ -39,6 +37,16 @@ public class HistogramTest {
     //    Chart chart = new ChartBuilder().chartType(ChartType.Bar).width(800).height(600).build();
     //    chart.addSeries("histogram 1", histogram.getxAxisData(), histogram.getyAxisData());
     //    new SwingWrapper(chart).displayChart();
+  }
 
+  @Test
+  public void testNegetiveValues() {
+
+    Histogram histogram = new Histogram(Arrays.asList(-1, -2, -3, -4, -5, -6), 3);
+
+    assertThat(histogram.getMax()).isEqualTo(-1);
+    assertThat(histogram.getMin()).isEqualTo(-6);
+    assertThat(histogram.getNumBins()).isEqualTo(3);
   }
+
 }