Proposed Fix for Daylight Savings bug