Fix for the datetime format issue