Fix Date problem