Simanta | #824 | Fixing date issues that occur during the last week of the year