Fix of broken date field