Fixed a datetime issue