Cleaning up the date fix