Fixed the timestamp and date