Fixing timestamp issue.