Other way to fix the date problem