diff --git a/src/screener/t_sunnyband.py b/src/screener/t_sunnyband.py
index f94db76..05f7c2d 100644
--- a/src/screener/t_sunnyband.py
+++ b/src/screener/t_sunnyband.py
@@ -134,10 +134,10 @@ def view_stock_details(ticker: str, interval: str, start_date: datetime, end_dat
                 "1hour": 60
             }
             minutes = minutes_map[interval]
-            
+                
             query = f"""
                 SELECT 
-                    fromUnixTimestamp(intDiv({date_col}, 300) * 300) as interval_start,
+                    toDateTime(intDiv({date_col}/1000000000, {minutes}*60) * ({minutes}*60)) as interval_start,
                     min(open) as open,
                     max(high) as high,
                     min(low) as low,
@@ -145,7 +145,7 @@ def view_stock_details(ticker: str, interval: str, start_date: datetime, end_dat
                     sum(volume) as volume
                 FROM stock_db.{table}
                 WHERE ticker = '{ticker}'
-                AND {date_col} BETWEEN toUnixTimestamp('{start_date}') AND toUnixTimestamp('{today}')
+                AND {date_col} BETWEEN {int(start_date.timestamp() * 1e9)} AND {int(today.timestamp() * 1e9)}
                 GROUP BY interval_start
                 ORDER BY interval_start ASC
             """