Fixed issue with DST