Fix issue with timestamps