Fix DateConverter bug