diff --git a/src/components/charts/DistributionPlot/distPlotD3.js b/src/components/charts/DistributionPlot/distPlotD3.js
index 87278d29..eddd0748 100644
--- a/src/components/charts/DistributionPlot/distPlotD3.js
+++ b/src/components/charts/DistributionPlot/distPlotD3.js
@@ -4,9 +4,14 @@ const moment = require('moment');
 require('./styles.css');
 
 /**
- * @todo: To rename as "DistPlotD3".
+ * @param arr
+ * @returns {*}
  */
-export class CdfChartD3 {
+function exists(arr) {
+  return arr.find(num => _.isFinite(num));
+}
+
+export class DistPlotD3 {
 
   constructor() {
     this.attrs = {
@@ -178,15 +183,27 @@ export class CdfChartD3 {
    */
   getCommonThings() {
     // Boundaries.
-    const xMin = this.attrs.minX
-      || d3.min(this.attrs.data.continuous.xs)
-      || d3.min(this.attrs.data.discrete.xs);
-    const xMax = this.attrs.maxX
-      || d3.max(this.attrs.data.continuous.xs)
-      || d3.max(this.attrs.data.discrete.xs);
+    const xMin = exists([
+      this.attrs.minX,
+      d3.min(this.attrs.data.continuous.xs),
+      d3.min(this.attrs.data.discrete.xs),
+    ]);
+    const xMax = exists([
+      this.attrs.maxX,
+      d3.max(this.attrs.data.continuous.xs),
+      d3.max(this.attrs.data.discrete.xs),
+    ]);
 
-    const yMin = d3.min(this.attrs.data.continuous.ys);
-    const yMax = d3.max(this.attrs.data.continuous.ys);
+    const yMin = exists([
+      this.attrs.minY,
+      d3.min(this.attrs.data.continuous.ys),
+      d3.min(this.attrs.data.discrete.ys),
+    ]);
+    const yMax = exists([
+      this.attrs.maxY,
+      d3.max(this.attrs.data.continuous.ys),
+      d3.max(this.attrs.data.discrete.ys),
+    ]);
 
     // Errors.
     if (!_.isFinite(xMin)) throw new Error('xMin is undefined');
diff --git a/src/components/charts/DistributionPlot/distPlotReact.js b/src/components/charts/DistributionPlot/distPlotReact.js
index 5385adcd..7cf0e34b 100644
--- a/src/components/charts/DistributionPlot/distPlotReact.js
+++ b/src/components/charts/DistributionPlot/distPlotReact.js
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useSize } from 'react-use';
-import { CdfChartD3 } from './distPlotD3';
+import { DistPlotD3 } from './distPlotD3';
 
 /**
  * @param min
@@ -14,12 +14,11 @@ function getRandomInt(min, max) {
 }
 
 /**
- * @todo: To rename as "DistPlotReact".
  * @param props
  * @returns {*}
  * @constructor
  */
-function CdfChartReact(props) {
+function DistPlotReact(props) {
   const containerRef = React.createRef();
   const key = "cdf-chart-react-" + getRandomInt(0, 1000);
   const scale = props.scale || 'linear';
@@ -35,7 +34,7 @@ function CdfChartReact(props) {
 
   useEffect(() => {
     try {
-      new CdfChartD3()
+      new DistPlotD3()
         .set('svgWidth', width)
         .set('svgHeight', props.height)
         .set('maxX', props.maxX)
@@ -79,4 +78,4 @@ function CdfChartReact(props) {
   ]);
 }
 
-export default CdfChartReact;
+export default DistPlotReact;