Fixing an issue with timestamp