Fix daylight savings time bug