diff --git a/.vs/AAOlivia-Plotter/v15/.suo b/.vs/AAOlivia-Plotter/v15/.suo
index 40c67a3b5..8efaf6e6f 100644
Binary files a/.vs/AAOlivia-Plotter/v15/.suo and b/.vs/AAOlivia-Plotter/v15/.suo differ
diff --git a/Candlestick.js b/Candlestick.js
index bb224383b..0aeab58bd 100644
--- a/Candlestick.js
+++ b/Candlestick.js
@@ -409,7 +409,10 @@
 
         /* Lests check if all the visible screen is going to be covered by candles. */
 
-        if (candles[0].begin > leftDate.valueOf() || candles[candles.length - 1].end > rightDate.valueOf()) {
+        let lowerEnd = leftDate.valueOf();
+        let upperEnd = removeTime(rightDate).valueOf() + ONE_DAY_IN_MILISECONDS;
+
+        if (candles[0].begin > lowerEnd || candles[candles.length - 1].end < upperEnd) {
 
             //setTimeout(recalculateCandlesUsingDailyFiles, 5000);