Added fix for daylight saving time