Fix date problem