diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 2eb55d7f..4dfdc921 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -11,7 +11,7 @@ from jinja2 import Template,Environment,FileSystemLoader
 def floatformat(x,prec=2):
     return '{x}'.format(x=round(x,prec))
 
-
+import time
 env = Environment(loader = FileSystemLoader(["rowers/templates"]))
 env.filters['floatformat'] = floatformat
 
@@ -4660,25 +4660,25 @@ def history_view(request,userid=0):
 
     usertimezone = pytz.timezone(r.defaulttimezone)
 
+    time_min = datetime.time(hour=0,minute=0,second=0)
+    time_max = datetime.time(hour=23,minute=59,second=59)
+
+
     if request.GET.get('startdate'):
         startdate,enddate = get_dates_timeperiod(request)
         sstartdate = startdate
         senddate = enddate
-        activity_startdate = datetime.datetime(
-            startdate.year,startdate.month,startdate.day
-            ).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
-        activity_enddate = datetime.datetime(
-            enddate.year,enddate.month,enddate.day
-            ).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+        activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate,time_min))
+        activity_enddate = usertimezone.localize(timezone.datetime.combine(enddate,time_max))
     else:
         activity_enddate = timezone.now()
-        activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
-        activity_startdate = activity_enddate-datetime.timedelta(days=15)
-        activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
-        sstartdate = datetime.date(year=activity_startdate.year,month=activity_startdate.month,
-                                   day=activity_startdate.day)
-        senddate = datetime.date(year=activity_enddate.year,month=activity_enddate.month,
-                                   day=activity_enddate.day)
+        activity_enddate = usertimezone.localize(timezone.datetime.combine(activity_enddate.date(),time_max))
+        startdate = timezone.now()-datetime.timedelta(days=14)
+        activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate.date(),time_min))
+        sstartdate = activity_startdate.date
+        senddate = activity_enddate.date
+        startdate = sstartdate
+        enddate = senddate
 
 
 
@@ -4815,24 +4815,20 @@ def history_view_data(request,userid=0):
     r = getrequestrower(request,userid=userid)
 
     usertimezone = pytz.timezone(r.defaulttimezone)
+    time_min = datetime.time(hour=0,minute=0,second=0)
+    time_max = datetime.time(hour=23,minute=59,second=59)
 
-    print(request.GET)
     if request.GET.get('startdate'):
         startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d")
         enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d")
-        activity_startdate = datetime.datetime(
-            startdate.year,startdate.month,startdate.day
-            ).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
-        activity_enddate = datetime.datetime(
-            enddate.year,enddate.month,enddate.day
-            ).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+        activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate,time_min))
+        activity_enddate = usertimezone.localize(timezone.datetime.combine(enddate,time_max))
     else:
         activity_enddate = timezone.now()
-        activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
-        activity_startdate = activity_enddate-datetime.timedelta(days=15)
-        activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+        activity_enddate = usertimezone.localize(timezone.datetime.combine(activity_enddate.date(),time_max))
+        startdate = timezone.now()-datetime.timedelta(days=14)
+        activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate.date(),time_min))
 
-    
 
     typeselect = 'All'
     if request.GET.get('workouttype'):