diff --git a/view-mode/function/overlaySCurve.js b/view-mode/function/overlaySCurve.js
index 0ea94ce..8ac457e 100644
--- a/view-mode/function/overlaySCurve.js
+++ b/view-mode/function/overlaySCurve.js
@@ -151,12 +151,12 @@ function adjustDataToZoom(dates, data, chartScaleRange, zoomLevel) {
     for (var i = 0; i < data.length; i++) {
         aggregateValue = data[i];
 
-        if (zoomLevel === 2 && i % 30 === 29) {
+        if (zoomLevel === 2 && i % 30 === 0) {
             // Aggregate data for each month (assuming 30 days in a month)
             newData.push(aggregateValue);
             newDates.push(dates[i]);
             aggregateValue = 0;
-        } else if (zoomLevel === 1 && (i + 1) % 7 === 0) {
+        } else if (zoomLevel === 1 && (i + 1) % 7 === 1) {
             // Aggregate data for each week
             newData.push(aggregateValue);
             newDates.push(dates[i]);