Fixed a slight issue with DateTime format