Fixed daylight saving bug