Fixed issue around DST change