fix for ticket 16/ date field adjustment