Fix Issue #9 issue with DST