Fixed the daylight savings issue