diff --git a/src/widgets/plotwidget.cpp b/src/widgets/plotwidget.cpp
index eb464af..6dfbe6f 100644
--- a/src/widgets/plotwidget.cpp
+++ b/src/widgets/plotwidget.cpp
@@ -1,96 +1,94 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Patrick José Pereira - patrickelectric@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "plotwidget.h"
 #include <QChart>
 #include <KLocalizedString>
 
 PlotWidget::PlotWidget(QWidget *parent) :
-    QWidget(parent)
+    QWidget(parent),
+    _chart(new QChartView()),
+    _axisY(new QValueAxis()),
+    _axisX(new QDateTimeAxis())
 {
-    _chart = new QChartView;
     QHBoxLayout *mainLayout = new QHBoxLayout;
     mainLayout->addWidget(_chart);
     this->setLayout(mainLayout);
 
     newPlot(i18n("Actual Bed"));
     newPlot(i18n("Target Bed"));
     // The extruder need to be added after some signal emitted (ExtruderCountChanged)
     newPlot(i18n("Actual Ext.1"));
     newPlot(i18n("Target Ext.1"));
     update();
 }
 
 void PlotWidget::newPlot(QString name)
 {
     // Create a new plot
     _name2Index[name] = _plots.size();
     plot _newPlot;
     _newPlot.setName(name);
     _plots.append(_newPlot);
 }
 
 void PlotWidget::deletePlot(QString name)
 {
     _plots.remove(_name2Index[name]);
     _name2Index[name] = -1;
 }
 
 void PlotWidget::appendPoint(QString name, float value)
 {
     _plots[_name2Index[name]].pushPoint(value);
 }
 
 void PlotWidget::update()
 {
-    static bool firstTimeCheck = true;
-    static QDateTimeAxis *axisX = new QDateTimeAxis;
-    static QValueAxis *axisY = new QValueAxis;
-
     // After already executed, update time axis
     if (firstTimeCheck == false) {
         _chart->chart()->axisX()->setRange(QDateTime::currentDateTime().addSecs(-120), QDateTime::currentDateTime());
         return;
     }
 
     firstTimeCheck = false;
 
-    axisX->setTickCount(3);
-    axisX->setFormat(QStringLiteral("hh:mm:ss"));
+    _axisX->setTickCount(3);
+    _axisX->setFormat(QStringLiteral("hh:mm:ss"));
 
-    axisY->setLabelFormat(QStringLiteral("%d"));
-    axisY->setTitleText(i18n("Temp."));
+    _axisY->setLabelFormat(QStringLiteral("%d"));
+    _axisY->setTitleText(i18n("Temp."));
 
-    _chart->chart()->addAxis(axisY, Qt::AlignLeft);
-    _chart->chart()->addAxis(axisX, Qt::AlignBottom);
+    _chart->chart()->addAxis(_axisY, Qt::AlignLeft);
+    _chart->chart()->addAxis(_axisX, Qt::AlignBottom);
 
     _chart->chart()->axisY()->setRange(0, 3e2);
     _chart->chart()->axisX()->setRange(QDateTime::currentDateTime().addSecs(-120), QDateTime::currentDateTime());
 
     for (auto plot : _plots) {
         _chart->chart()->addSeries(plot.serie());
-        plot.serie()->attachAxis(axisY);
-        plot.serie()->attachAxis(axisX);
+        plot.serie()->attachAxis(_axisY);
+        plot.serie()->attachAxis(_axisX);
     }
 
     _chart->setRenderHint(QPainter::Antialiasing);
 }
 
 PlotWidget::~PlotWidget()
 {
 }
diff --git a/src/widgets/plotwidget.h b/src/widgets/plotwidget.h
index fef3717..5f99854 100644
--- a/src/widgets/plotwidget.h
+++ b/src/widgets/plotwidget.h
@@ -1,113 +1,115 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Patrick José Pereira - patrickelectric@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
 
 #include <QChartView>
 #include <QWidget>
 #include <QtCharts>
 
 class PlotWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     explicit PlotWidget(QWidget *parent = nullptr);
     ~PlotWidget();
 
     /**
      * @brief Create a new plot
      *
      * @param name p_name: plot name
      */
     void newPlot(QString name);
 
     /**
      * @brief Delete plot with name
      *
      * @param name p_name: name
      */
     void deletePlot(QString name);
 
     /**
      * @brief Append point to plot
      *
      * @param name p_name: plot name
      * @param value p_value: value
      */
     void appendPoint(QString name, float value);
 
     /**
      * @brief Update plot list, need to run after ALL plots added
      *
      */
     void update();
 private:
 
     QChartView *_chart;
+    QDateTimeAxis *_axisX;
+    QValueAxis *_axisY;
 
     QHash<QString, int> _name2Index;
 
     class plot
     {
     public:
         explicit plot()
         {
             _series = new QLineSeries();
         };
 
         ~plot()
         {
             // Series will be deleted with chart
         };
 
         void pushPoint(float value)
         {
             QDateTime now = QDateTime::currentDateTime();
             _series->append(now.toMSecsSinceEpoch(), value);
         }
 
         void setName(QString name)
         {
             _name = name;
             _series->setName(_name);
 
             //Add 3 initial points to plot
             QDateTime now = QDateTime::currentDateTime();
             _series->append(now.toMSecsSinceEpoch() - 2 * 60e3, 0.0);
             _series->append(now.toMSecsSinceEpoch() - 60e3, 0.0);
             _series->append(now.toMSecsSinceEpoch(), 0.0);
         }
 
         QLineSeries *serie()
         {
             return _series;
         }
 
         QString name()
         {
             return _name;
         }
 
     private:
         QLineSeries *_series;
         QString _name;
     };
 
     QVector<plot> _plots;
 };