Handling case when date format is overwritten