Work on timestamp issue.