Expanded fix for timezone bug to include endtime