Fix issue with datetime format