Fix date field controller