diff --git a/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/entity/WorkingDayForStats.java b/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/entity/WorkingDayForStats.java
index de7fc50..3201276 100644
--- a/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/entity/WorkingDayForStats.java
+++ b/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/entity/WorkingDayForStats.java
@@ -112,6 +112,7 @@ public class WorkingDayForStats extends WorkingDay {
                         l.add(wd);
                     });
                 }
+                System.out.println("list7.size()=" + list7.size());
                 wd.setArrivalTimeMovingAverage7Days(list7.stream()
                         .map(WorkingDay::getArrivalAsDouble)
                         .mapToDouble(Double::doubleValue)
@@ -132,6 +133,10 @@ public class WorkingDayForStats extends WorkingDay {
                         .mapToDouble(Double::doubleValue)
                         .average()
                         .orElse(0.0));
+                if(list7.isEmpty()) wd.setArrivalTimeMovingAverage7Days(wd.getArrivalTimeMovingAverage56Days());
+                if(list14.isEmpty()) wd.setArrivalTimeMovingAverage14Days(wd.getArrivalTimeMovingAverage56Days());
+                if(list28.isEmpty()) wd.setArrivalTimeMovingAverage28Days(wd.getArrivalTimeMovingAverage56Days());
+
 //                System.out.println(
 //                        WorkingDay.createId(cal) + " 1 :: " + list7.size());
 //                System.out.println(
diff --git a/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/swing/common/ArrivalChart.java b/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/swing/common/ArrivalChart.java
index 087eb0e..ef67dbe 100644
--- a/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/swing/common/ArrivalChart.java
+++ b/modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/swing/common/ArrivalChart.java
@@ -248,7 +248,11 @@ public class ArrivalChart extends JPanel {
             seriesTarget.add(day3, new Double(0d));
             seriesTargetMinus30Minutes.add(day3, new Double(-0.5d));
             seriesTargetMinus60Minutes.add(day3, new Double(-1.0d));
-            seriesMa7.add(day3, new Double(ma7[i]));
+            double ma7i = ma7[i];
+            if(ma7i < (ma28[i] - 2)) {
+                ma7i = ma28[i] - 2;
+            }
+            seriesMa7.add(day3, new Double(ma7i));
             seriesMa14.add(day3, new Double(ma14[i]));
             seriesMa28.add(day3, new Double(ma28[i]));
             seriesMa56.add(day3, new Double(ma56[i]));