diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index 4e04f59..f847e37 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -244,7 +244,7 @@ void QAreaSeriesPrivate::scaleDomain(Domain& domain)
     }
     if(lowerSeries) {
 
-        const QList<QPointF>& points = upperSeries->points();
+        const QList<QPointF>& points = lowerSeries->points();
 
         for (int i = 0; i < points.count(); i++)
         {
diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp
index 671c265..bc6133b 100644
--- a/src/splinechart/qsplineseries.cpp
+++ b/src/splinechart/qsplineseries.cpp
@@ -87,7 +87,7 @@ void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orie
 {
     Q_D(QSplineSeries);
     QXYSeries::setModelMapping(modelX, modelY, orientation);
-    d->calculateControlPoints();
+    d->updateControlPoints();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,16 +104,19 @@ QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries* q):QLineSeriesPrivate(
   */
 void QSplineSeriesPrivate::calculateControlPoints()
 {
+    Q_Q(QSplineSeries);
+
+    const QList<QPointF>& points = q->points();
 
-    int n = m_points.count() - 1;
+    int n = points.count() - 1;
 
     if (n == 1)
     {
         //for n==1
-        m_controlPoints[0].setX((2 * m_points[0].x() + m_points[1].x()) / 3);
-        m_controlPoints[0].setY((2 * m_points[0].y() + m_points[1].y()) / 3);
-        m_controlPoints[1].setX(2 * m_controlPoints[0].x() - m_points[0].x());
-        m_controlPoints[1].setY(2 * m_controlPoints[0].y() - m_points[0].y());
+        m_controlPoints[0].setX((2 * points[0].x() + points[1].x()) / 3);
+        m_controlPoints[0].setY((2 * points[0].y() + points[1].y()) / 3);
+        m_controlPoints[1].setX(2 * m_controlPoints[0].x() - points[0].x());
+        m_controlPoints[1].setY(2 * m_controlPoints[0].y() - points[0].y());
         return;
     }
 
@@ -133,24 +136,24 @@ void QSplineSeriesPrivate::calculateControlPoints()
     QVector<qreal> vector;
     vector.resize(n);
 
-    vector[0] = m_points[0].x() + 2 * m_points[1].x();
+    vector[0] = points[0].x() + 2 * points[1].x();
 
 
     for (int i = 1; i < n - 1; ++i){
-        vector[i] = 4 * m_points[i].x() + 2 * m_points[i + 1].x();
+        vector[i] = 4 * points[i].x() + 2 * points[i + 1].x();
     }
 
-    vector[n - 1] = (8 * m_points[n-1].x() + m_points[n].x()) / 2.0;
+    vector[n - 1] = (8 * points[n-1].x() + points[n].x()) / 2.0;
 
     QVector<qreal> xControl = firstControlPoints(vector);
 
-    vector[0] = m_points[0].y() + 2 * m_points[1].y();
+    vector[0] = points[0].y() + 2 * points[1].y();
 
     for (int i = 1; i < n - 1; ++i) {
-        vector[i] = 4 * m_points[i].y() + 2 * m_points[i + 1].y();
+        vector[i] = 4 * points[i].y() + 2 * points[i + 1].y();
     }
 
-    vector[n - 1] = (8 * m_points[n-1].y() + m_points[n].y()) / 2.0;
+    vector[n - 1] = (8 * points[n-1].y() + points[n].y()) / 2.0;
 
     QVector<qreal> yControl = firstControlPoints(vector);
 
@@ -162,11 +165,11 @@ void QSplineSeriesPrivate::calculateControlPoints()
         j++;
 
         if (i < n - 1){
-            m_controlPoints[j].setX(2 * m_points[i+1].x() - xControl[i + 1]);
-            m_controlPoints[j].setY(2 * m_points[i+1].y() - yControl[i + 1]);
+            m_controlPoints[j].setX(2 * points[i+1].x() - xControl[i + 1]);
+            m_controlPoints[j].setY(2 * points[i+1].y() - yControl[i + 1]);
         }else{
-            m_controlPoints[j].setX((m_points[n].x() + xControl[n - 1]) / 2);
-            m_controlPoints[j].setY((m_points[n].y() + yControl[n - 1]) / 2);
+            m_controlPoints[j].setX((points[n].x() + xControl[n - 1]) / 2);
+            m_controlPoints[j].setY((points[n].y() + yControl[n - 1]) / 2);
         }
     }
 }
@@ -201,8 +204,9 @@ QVector<qreal> QSplineSeriesPrivate::firstControlPoints(const QVector<qreal>& ve
   */
 void QSplineSeriesPrivate::updateControlPoints()
 {
-    if (m_points.count() > 1) {
-        m_controlPoints.resize(2*m_points.count()-2);
+    Q_Q(QSplineSeries);
+    if (q->count() > 1) {
+        m_controlPoints.resize(2*q->count()-2);
         calculateControlPoints();
     }
 }
diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp
index b329b1a..500c221 100644
--- a/src/xychart/qxyseries.cpp
+++ b/src/xychart/qxyseries.cpp
@@ -395,11 +395,13 @@ void QXYSeriesPrivate::scaleDomain(Domain& domain)
     int tickXCount(domain.tickXCount());
     int tickYCount(domain.tickYCount());
 
-    for (int i = 0; i < m_points.count(); i++)
-    {
+    Q_Q(QXYSeries);
 
-        qreal x = m_points[i].x();
-        qreal y = m_points[i].y();
+    const QList<QPointF>& points = q->points();
+    for (int i = 0; i < points.count(); i++)
+    {
+        qreal x = points[i].x();
+        qreal y = points[i].y();
         minX = qMin(minX, x);
         minY = qMin(minY, y);
         maxX = qMax(maxX, x);
diff --git a/src/xychart/xychartitem.cpp b/src/xychart/xychartitem.cpp
index f3f9acf..2555f7b 100644
--- a/src/xychart/xychartitem.cpp
+++ b/src/xychart/xychartitem.cpp
@@ -273,7 +273,6 @@ void XYChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal 
     m_maxX=maxX;
     m_minY=minY;
     m_maxY=maxY;
-
     if (isEmpty()) return;
     QVector<QPointF> points = calculateGeometryPoints();
     updateLayout(m_points,points);