Fix DateUtil