diff --git a/src/mainwindow/Chart.java b/src/mainwindow/Chart.java
index ba9ce24..8893ce1 100644
--- a/src/mainwindow/Chart.java
+++ b/src/mainwindow/Chart.java
@@ -475,6 +475,7 @@ public int numberOfSamples() {
     public boolean update() {
 
         if (null != series1) {
+            System.out.println(series1.getData().sorted().size());
             return series1.getData().sorted().size() > samples;
         }
         else return false;
diff --git a/src/plot/Plot.java b/src/plot/Plot.java
index 143d99c..438e11a 100644
--- a/src/plot/Plot.java
+++ b/src/plot/Plot.java
@@ -63,7 +63,7 @@ public void run() {
                         receivedFrame.setNumberOfChannels(receivedFrame.getChannelData().size());
                         if (receivedFrame.getNumberOfChannels() != numberOfChannels) {
                             numberOfChannels = receivedFrame.getNumberOfChannels();
-                            for (int i = 8; i > 8 - numberOfChannels; i++) {
+                            for (int i = 8; i > numberOfChannels; i--) {
                                 int finalI = i;
                                 Platform.runLater(() -> {
                                     switch (finalI) {
@@ -136,7 +136,7 @@ public void run() {
                                         break;
                                 }
                         }
-                        boolean update = Chart.getInstance().update();
+                        final boolean update = Chart.getInstance().update();
                         final int samples = Chart.getInstance().numberOfSamples();
                         if (update) {
                             final int removeData=series1.getData().size()-samples;